Changeset 412

Show
Ignore:
Timestamp:
07/20/06 09:53:30 (2 years ago)
Author:
kickback
Message:

aube-gtk2: sync with trunk ( changeset:407 new float sliders )

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • aube/branches/aube-gtk2/src/master.c

    r406 r412  
    416416  gtk_widget_show(frame); 
    417417 
    418   slider = slider_new("BPM", &bpm, 30, 240, 1); 
     418  slider = slider_int_new("BPM", &bpm, 30, 240, 1); 
    419419  gtk_container_add (GTK_CONTAINER (frame), slider); 
    420420  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/atonal_if.c

    r406 r412  
    159159 
    160160#if 0 
    161     slider = slider_new("", &(atonal_if->data->vol), 0, 64, 0); 
     161    slider = slider_int_new("", &(atonal_if->data->vol), 0, 64, 0); 
    162162    gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, FALSE, 0); 
    163163    gtk_widget_show(slider); 
    …… 
    177177 
    178178    snprintf(buf, 4, "%d", i); 
    179     slider = slider_new(buf, &(atonal_if->data->sequence[i].note), 110, 660, 1); 
     179    slider = slider_int_new(buf, &(atonal_if->data->sequence[i].note), 110, 660, 1); 
    180180    gtk_box_pack_start(GTK_BOX(vbox2), slider, TRUE, TRUE, 0); 
    181181    gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/delay_if.c

    r406 r412  
    155155 
    156156#if 0 
    157   slider = slider_new("Input Vol", &(delay_if->data->input_vol), 0, 64, 1); 
     157  slider = slider_int_new("Input Vol", &(delay_if->data->input_vol), 0, 64, 1); 
    158158  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    159159  gtk_widget_show(slider); 
    160160#endif 
    161161 
    162   slider = slider_new("Delay", &(delay_if->data->offset), 0, DELAY_BUFFER_LENGTH / 2, 1); 
     162  slider = slider_int_new("Delay", &(delay_if->data->offset), 0, DELAY_BUFFER_LENGTH / 2, 1); 
    163163  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    164164  gtk_widget_show(slider); 
    165165 
    166   slider = slider_new("Delay Vol", &(delay_if->data->delay_vol), 0, 64, 1); 
     166  slider = slider_int_new("Delay Vol", &(delay_if->data->delay_vol), 0, 64, 1); 
    167167  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    168168  gtk_widget_show(slider); 
    169169 
    170   slider = slider_new("Delay Pan", &(delay_if->data->pan), 0, 32, 0); 
     170  slider = slider_int_new("Delay Pan", &(delay_if->data->pan), 0, 32, 0); 
    171171  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, TRUE, 0); 
    172172  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/drummachine_if.c

    r406 r412  
    224224 
    225225#if 0 
    226     slider = slider_new("Vol", &(drummachine_if->data->vol), 0, 64, 0); 
     226    slider = slider_int_new("Vol", &(drummachine_if->data->vol), 0, 64, 0); 
    227227    gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, FALSE, 0); 
    228228    gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/filter_reslp_if.c

    r406 r412  
    171171  gtk_widget_show(hbox3); 
    172172 
    173   slider = slider_new("Vol", &(filter_reslp_if->data->vol), 0, 64, 1); 
     173  slider = slider_int_new("Vol", &(filter_reslp_if->data->vol), 0, 64, 1); 
    174174  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    175175  gtk_widget_show(slider); 
    176176 
    177177#if 0 
    178   slider = slider_new("Tune", &(filter_reslp_if->data->tune), 1, 1024, 1); 
     178  slider = slider_int_new("Tune", &(filter_reslp_if->data->tune), 1, 1024, 1); 
    179179  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    180180  gtk_signal_connect(GTK_OBJECT(SLIDER(slider)->adj), "value_changed", 
    …… 
    183183#endif 
    184184 
    185   slider = slider_new("Pan", &(filter_reslp_if->data->pan), 0, 32, 0); 
     185  slider = slider_int_new("Pan", &(filter_reslp_if->data->pan), 0, 32, 0); 
    186186  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, FALSE, 0); 
    187187  gtk_widget_show(slider); 
    …… 
    202202  gtk_widget_show(hbox3); 
    203203 
    204   slider = slider_new("Res.", &(filter_reslp_if->data->resonance_base), 0, 200, 1); 
     204  slider = slider_int_new("Res.", &(filter_reslp_if->data->resonance_base), 0, 200, 1); 
    205205  gtk_box_pack_start(GTK_BOX(hbox3), slider, FALSE, TRUE, 0); 
    206206  gtk_widget_show(slider); 
    …… 
    223223  gtk_widget_show(hbox3); 
    224224 
    225   slider = slider_new("Cutoff", &(filter_reslp_if->data->cutoff_base), 
     225  slider = slider_int_new("Cutoff", &(filter_reslp_if->data->cutoff_base), 
    226226                      20, 20000, 1); 
    227227  gtk_box_pack_start(GTK_BOX(hbox3), slider, FALSE, TRUE, 0); 

  • aube/branches/aube-gtk2/src/modules/general_mixer_if.c

    r406 r412  
    135135  gtk_widget_show(vbox); 
    136136 
    137   slider = slider_new("Master", &(general_mixer_if->data->master_vol), 0, 64, 1); 
     137  slider = slider_int_new("Master", &(general_mixer_if->data->master_vol), 0, 64, 1); 
    138138  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, TRUE, 0); 
    139139  gtk_widget_show(slider); 
    …… 
    246246 
    247247  sprintf(buf, "%d", i); 
    248   slider = slider_new(buf, &(general_mixer_if->data->vol[i]), 0, 64, 1); 
     248  slider = slider_int_new(buf, &(general_mixer_if->data->vol[i]), 0, 64, 1); 
    249249  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, TRUE, 0); 
    250250  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/klavier_if.c

    r406 r412  
    164164  gtk_widget_show(hbox3); 
    165165 
    166   slider = slider_new("Vol", &(klavier_if->data->vol), 0, 64, 1); 
     166  slider = slider_int_new("Vol", &(klavier_if->data->vol), 0, 64, 1); 
    167167  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    168168  gtk_widget_show(slider); 
    169169 
    170   slider = slider_new("Tune", &(klavier_if->data->tune), 1, 1024, 1); 
     170  slider = slider_int_new("Tune", &(klavier_if->data->tune), 1, 1024, 1); 
    171171  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    172172  gtk_widget_show(slider); 
    173173 
    174   slider = slider_new("Pan", &(klavier_if->data->pan), 0, 32, 0); 
     174  slider = slider_int_new("Pan", &(klavier_if->data->pan), 0, 32, 0); 
    175175  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, FALSE, 0); 
    176176  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/linein_if.c

    r406 r412  
    167167  gtk_widget_show(hbox3); 
    168168 
    169   slider = slider_new("Vol", &(linein_if->data->vol), 0, 64, 1); 
     169  slider = slider_int_new("Vol", &(linein_if->data->vol), 0, 64, 1); 
    170170  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    171171  gtk_widget_show(slider); 
    172172 
    173   slider = slider_new("Pan", &(linein_if->data->pan), 0, 32, 0); 
     173  slider = slider_int_new("Pan", &(linein_if->data->pan), 0, 32, 0); 
    174174  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, FALSE, 0); 
    175175  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/lineout_if.c

    r406 r412  
    133133  gtk_widget_show(hbox3); 
    134134 
    135   slider = slider_new("Vol", &(lineout_if->data->vol), 0, 64, 1); 
     135  slider = slider_int_new("Vol", &(lineout_if->data->vol), 0, 64, 1); 
    136136  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    137137  gtk_widget_show(slider); 
    138138 
    139   slider = slider_new("Pan", &(lineout_if->data->pan), 0, 32, 0); 
     139  slider = slider_int_new("Pan", &(lineout_if->data->pan), 0, 32, 0); 
    140140  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, FALSE, 0); 
    141141  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/minimaube_if.c

    r406 r412  
    270270 
    271271  sprintf(buf, "%d", i); 
    272   slider = slider_new(buf, &(minimaube_if->data->vol[i]), 0, 64, 1); 
     272  slider = slider_int_new(buf, &(minimaube_if->data->vol[i]), 0, 64, 1); 
    273273  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, FALSE, 0); 
    274274  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/minitracker_if.c

    r406 r412  
    167167  gtk_widget_show(hbox3); 
    168168 
    169   slider = slider_new("Vol", &(minitracker_if->data->vol), 0, 64, 1); 
     169  slider = slider_int_new("Vol", &(minitracker_if->data->vol), 0, 64, 1); 
    170170  gtk_box_pack_start(GTK_BOX(hbox3), slider, FALSE, FALSE, 0); 
    171171  gtk_widget_show(slider); 
    172172 
    173   slider = slider_new("Tune", &(minitracker_if->data->tune), 1, 1024, 1); 
     173  slider = slider_int_new("Tune", &(minitracker_if->data->tune), 1, 1024, 1); 
    174174  gtk_box_pack_start(GTK_BOX(hbox3), slider, FALSE, FALSE, 0); 
    175175  gtk_widget_show(slider); 
    176176 
    177   slider = slider_new("Pan", &(minitracker_if->data->pan), 0, 32, 0); 
     177  slider = slider_int_new("Pan", &(minitracker_if->data->pan), 0, 32, 0); 
    178178  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, FALSE, 0); 
    179179  gtk_widget_show(slider); 
    …… 
    274274   */ 
    275275 
    276   slider = slider_new("Portamento", &(minitracker_if->data->portamento), 0, 64, 1); 
     276  slider = slider_int_new("Portamento", &(minitracker_if->data->portamento), 0, 64, 1); 
    277277  gtk_box_pack_start(GTK_BOX(hbox), slider, TRUE, FALSE, 0); 
    278278  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/panner4_if.c

    r406 r412  
    163163  gtk_widget_show(hbox3); 
    164164 
    165   slider = slider_new("Fade", &(panner4_if->data->fade), 0, 32, 1); 
     165  slider = slider_int_new("Fade", &(panner4_if->data->fade), 0, 32, 1); 
    166166  gtk_box_pack_start(GTK_BOX(hbox3), slider, TRUE, FALSE, 0); 
    167167  gtk_widget_show(slider); 
    168168 
    169   slider = slider_new("Pan", &(panner4_if->data->pan), 0, 32, 0); 
     169  slider = slider_int_new("Pan", &(panner4_if->data->pan), 0, 32, 0); 
    170170  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, TRUE, 0); 
    171171  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/panner_if.c

    r406 r412  
    147147  gtk_widget_show(vbox); 
    148148 
    149   slider = slider_new("Input", &(panner_if->data->vol), 0, 64, 1); 
     149  slider = slider_int_new("Input", &(panner_if->data->vol), 0, 64, 1); 
    150150  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, TRUE, 0); 
    151151  gtk_widget_show(slider); 
    152152 
    153   slider = slider_new("Pan", &(panner_if->data->pan), 0, 32, 0); 
     153  slider = slider_int_new("Pan", &(panner_if->data->pan), 0, 32, 0); 
    154154  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, TRUE, 0); 
    155155  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/syre_if.c

    r406 r412  
    344344    sprintf(nc, "%d", i); 
    345345    syre_if->sliders[i] = 
    346       slider_new(nc, &(syre_if->data->overtones[i].vol), 0, 32, 1); 
     346      slider_int_new(nc, &(syre_if->data->overtones[i].vol), 0, 32, 1); 
    347347    gtk_signal_connect(GTK_OBJECT(SLIDER(syre_if->sliders[i])->adj), "value_changed", 
    348348                       GTK_SIGNAL_FUNC(harmonics_changed_cb), syre_if->data); 

  • aube/branches/aube-gtk2/src/modules/whitenoise_if.c

    r406 r412  
    142142  gtk_widget_show(vbox); 
    143143 
    144   slider = slider_new("Vol", &(whitenoise_if->data->vol), 0, 64, 1); 
     144  slider = slider_int_new("Vol", &(whitenoise_if->data->vol), 0, 64, 1); 
    145145  gtk_box_pack_start(GTK_BOX(vbox), slider, TRUE, TRUE, 0); 
    146146  gtk_widget_show(slider); 
    147147 
    148   slider = slider_new("Pan", &(whitenoise_if->data->pan), 0, 32, 0); 
     148  slider = slider_int_new("Pan", &(whitenoise_if->data->pan), 0, 32, 0); 
    149149  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, TRUE, 0); 
    150150  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/modules/xfader_if.c

    r406 r412  
    147147  gtk_widget_show(hbox2); 
    148148 
    149   slider = slider_new("Vol0", &(xfader_if->data->vol0), 0, 64, 1); 
     149  slider = slider_int_new("Vol0", &(xfader_if->data->vol0), 0, 64, 1); 
    150150  gtk_box_pack_start(GTK_BOX(hbox2), slider, TRUE, TRUE, 0); 
    151151  gtk_widget_show(slider); 
    152152 
    153   slider = slider_new("Vol1", &(xfader_if->data->vol1), 0, 64, 1); 
     153  slider = slider_int_new("Vol1", &(xfader_if->data->vol1), 0, 64, 1); 
    154154  gtk_box_pack_start(GTK_BOX(hbox2), slider, TRUE, TRUE, 0); 
    155155  gtk_widget_show(slider); 
    156156 
    157   slider = slider_new("Fader", &(xfader_if->data->fader), 0, 64, 0); 
     157  slider = slider_int_new("Fader", &(xfader_if->data->fader), 0, 64, 0); 
    158158  gtk_box_pack_start(GTK_BOX(vbox), slider, FALSE, TRUE, 0); 
    159159  gtk_widget_show(slider); 

  • aube/branches/aube-gtk2/src/slider.c

    r411 r412  
    77static void slider_class_init(SliderClass * klass); 
    88static void slider_init(Slider * b); 
    9 GtkWidget *slider_new(); 
     9GtkWidget *slider_int_new(); 
    1010void slider_dismiss(GtkWidget * widget, gpointer data); 
    1111void slider_cb(GtkWidget * widget, gpointer data); 
    …… 
    4949 
    5050GtkWidget * 
    51 slider_new(char *label_str, int *data, int lower, int upper, int vert) 
     51slider_int_new(char *label_str, int *data, int lower, int upper, int vert) 
    5252{ 
    5353  Slider *slider; 
    …… 
    5858  gtk_container_border_width(GTK_CONTAINER(slider), 1); 
    5959 
    60   slider->data = data; 
     60  slider->type = SLIDER_TYPE_INT; 
     61  slider->data.iptr = data; 
    6162 
    6263  sprintf (slider->value_str, "%d", *data); 
    …… 
    9495} 
    9596 
     97GtkWidget * 
     98slider_float_new(char *label_str, float *data, float lower, float upper, int vert) 
     99{ 
     100  Slider *slider; 
     101  GtkWidget *label; 
     102 
     103  slider = gtk_type_new(slider_get_type()); 
     104 
     105  gtk_container_border_width(GTK_CONTAINER(slider), 1); 
     106 
     107  slider->type = SLIDER_TYPE_FLOAT; 
     108  slider->data.fptr = data; 
     109 
     110  snprintf (slider->value_str, sizeof (slider->value_str), "%5.2f", *data); 
     111  slider->value_label = gtk_label_new (slider->value_str); 
     112  gtk_box_pack_start (GTK_BOX (slider), slider->value_label, FALSE, TRUE, 0); 
     113  gtk_widget_show (slider->value_label); 
     114 
     115  slider->adj = gtk_adjustment_new(lower + upper - *data, 
     116                                   lower, upper, 
     117                                   1.0, 1.0, 0.0); 
     118 
     119  if (vert) { 
     120    slider->scale = GTK_SCALE(gtk_vscale_new(GTK_ADJUSTMENT(slider->adj))); 
     121    /* gtk_widget_set_usize(GTK_WIDGET(slider->scale), 16, 120); */ 
     122  } else { 
     123    slider->scale = GTK_SCALE(gtk_hscale_new(GTK_ADJUSTMENT(slider->adj))); 
     124    /* gtk_widget_set_usize(GTK_WIDGET(slider->scale), 120, 16); */ 
     125  } 
     126  gtk_box_pack_start(GTK_BOX(slider), GTK_WIDGET(slider->scale), TRUE, TRUE, 0); 
     127  gtk_range_set_update_policy(GTK_RANGE(slider->scale), GTK_UPDATE_CONTINUOUS); 
     128 
     129  /* draw number above scale */ 
     130  gtk_scale_set_draw_value(GTK_SCALE(slider->scale), FALSE); 
     131 
     132  gtk_signal_connect(GTK_OBJECT(slider->adj), "value_changed", 
     133                     GTK_SIGNAL_FUNC(slider_cb), slider); 
     134  gtk_widget_show(GTK_WIDGET(slider->scale)); 
     135 
     136  label = gtk_label_new(label_str); 
     137  gtk_box_pack_start(GTK_BOX(slider), label, 
     138                     FALSE, FALSE, 0); 
     139  gtk_widget_show(label); 
     140 
     141  return GTK_WIDGET(slider); 
     142} 
     143 
    96144void 
    97145slider_dismiss(GtkWidget * widget, gpointer data) 
    …… 
    106154  GtkAdjustment * adj = (GtkAdjustment *)slider->adj; 
    107155 
    108   *(slider->data) = 
     156  *(slider->data.iptr) = 
    109157    (int) (adj->lower + adj->upper - adj->value); 
    110158 
    111   sprintf (slider->value_str, "%d", *(slider->data)); 
     159  snprintf (slider->value_str, sizeof (slider->value_str), "%d", *(slider->data.iptr)); 
    112160  gtk_label_set_text (GTK_LABEL(SLIDER(data)->value_label), slider->value_str); 
    113161 
    …… 
    117165} 
    118166 
     167  void 
     168 slider_float_cb(GtkWidget * widget, gpointer data) 
     169 { 
     170   Slider * slider = SLIDER(data); 
     171   GtkAdjustment * adj = (GtkAdjustment *)slider->adj; 
     172 
     173   *(slider->data.fptr) = adj->lower + adj->upper - adj->value; 
     174 
     175   snprintf (slider->value_str, sizeof (slider->value_str), "%5.2f", *(slider->data.fptr)); 
     176   gtk_label_set_text (GTK_LABEL(SLIDER(data)->value_label), slider->value_str); 
     177 
     178 #if 0 
     179+   g_print("slider: %d\n", *(SLIDER(data)->data)); 
     180 #endif 
     181 } 
     182 
     183 
    119184void 
    120 slider_refresh(GtkWidget * slider) 
    121 { 
    122   gtk_adjustment_set_value(SLIDER(slider)->adj,  (GTK_ADJUSTMENT(SLIDER(slider)->adj)->upper - *(SLIDER(slider)->data))); 
    123 } 
     185  slider_refresh(GtkWidget * slider) 
     186  { 
     187   switch (SLIDER(slider)->type) { 
     188   case SLIDER_TYPE_INT: 
     189     gtk_adjustment_set_value(GTK_ADJUSTMENT(SLIDER(slider)->adj),  
     190                                GTK_ADJUSTMENT(SLIDER(slider)->adj)->upper - *(SLIDER(slider)->data.iptr)); 
     191       break; 
     192   case SLIDER_TYPE_FLOAT: 
     193     gtk_adjustment_set_value(GTK_ADJUSTMENT(SLIDER(slider)->adj), 
     194                                GTK_ADJUSTMENT(SLIDER(slider)->adj)->upper - *(SLIDER(slider)->data.fptr)); 
     195       break; 
     196   default: 
     197     printf ("Ooops : Bad slider type : %d\n", SLIDER(slider)->type); 
     198     return; 
     199   } 
     200} 

  • aube/branches/aube-gtk2/src/slider.h

    r406 r412  
    1414#define IS_SLIDER(obj)       GTK_CHECK_TYPE (obj, slider_get_type ()) 
    1515 
     16enum { 
     17  SLIDER_TYPE_INT = 100, 
     18  SLIDER_TYPE_FLOAT 
     19} ; 
    1620 
    1721typedef struct _Slider Slider; 
    …… 
    2327  GtkWidget * value_label; 
    2428  GtkObject * adj; 
    25   int *data; 
     29 
     30  int type ; 
     31 
     32  union { 
     33        int             *iptr ; 
     34        float   *fptr ; 
     35  } data ; 
     36   
    2637  GtkScale *scale; 
    2738}; 
    …… 
    3445 
    3546GType slider_get_type(void); 
    36 GtkWidget *slider_new(char *label_str, int *data, int lower, int upper, 
     47GtkWidget *slider_int_new(char *label_str, int *data, int lower, int upper, 
     48                      int vert); 
     49GtkWidget *slider_float_new(char *label_str, float *data, float lower, float upper, 
    3750                      int vert); 
    3851void slider_refresh(GtkWidget * slider);