← Back to branch summary

~blackskad/gnomeradio/dev-vol-button

« back to all changes in this revision

Viewing changes to src/gui.c

  • Committer: Thomas Meire
  • Date: 2008-12-20 19:34:59 UTC
  • Revision ID: blackskad@awesomeness-20081220193459-x0n1bieryqc6vps4
Replaced bacon-volume-button with GtkVolumeButton

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui.c
24
24
#include <gnome.h>
25
25
#include <gconf/gconf-client.h>
26
26
#include <math.h>
27
 
#include "bacon-volume.h"
28
27
#include "gui.h"
29
28
#include "trayicon.h"
30
29
#include "tech.h"
192
191
        }       
193
192
}       
194
193
 
 
194
int gtk_volume_button_get_value (GtkWidget *button)
 
195
{
 
196
        return (int) (gtk_scale_button_get_value(GTK_SCALE_BUTTON(button)) * 100);
 
197
}
 
198
 
 
199
void gtk_volume_button_set_value (GtkWidget *button, int value)
 
200
{
 
201
        gtk_scale_button_set_value(GTK_SCALE_BUTTON(button), (gdouble) value / 100);
 
202
}
 
203
 
195
204
static void prefs_button_clicked_cb(GtkButton *button, gpointer app)
196
205
{
197
206
        GtkWidget* dialog;
273
282
        }               
274
283
        vol = mixer_get_volume();
275
284
        if (vol >= 0) {
276
 
                bacon_volume_button_set_value(BACON_VOLUME_BUTTON(mute_button), vol);
 
285
                g_message("setting volume: %d -> %d", gtk_volume_button_get_value(mute_button), vol);
 
286
                gtk_volume_button_set_value(mute_button, vol);
 
287
                g_message("new volume: %d", gtk_volume_button_get_value(mute_button));
277
288
                /*gtk_adjustment_set_value(volume, (double)vol);*/
278
289
        }
279
290
}
422
433
        radio_set_freq(adj->value/STEPS);
423
434
}
424
435
 
425
 
static void volume_value_changed_cb(BaconVolumeButton *button, gpointer user_data)
 
436
static void volume_value_changed_cb(GtkVolumeButton *button, gpointer user_data)
426
437
{
427
438
        char *text;
428
 
        int vol = (int)(bacon_volume_button_get_value(BACON_VOLUME_BUTTON(mute_button)) + 0.5f);
429
 
        
 
439
        int vol = (int)(gtk_volume_button_get_value(mute_button) + 0.5f);
 
440
 
430
441
        mixer_set_volume(vol);
431
442
        
432
443
/*      text = g_strdup_printf(_("Volume: %d%%"), vol);
715
726
                vol = old_vol;
716
727
        }       
717
728
        mixer_set_volume(vol);
718
 
        bacon_volume_button_set_value(BACON_VOLUME_BUTTON(mute_button), vol);
 
729
        gtk_volume_button_set_value(mute_button, vol);
719
730
        /*gtk_adjustment_set_value(volume, vol);*/
720
731
}       
721
732
 
852
863
        stbw_button = gtk_button_new();
853
864
        about_button = gtk_button_new();
854
865
        /*mute_button = gtk_toggle_button_new();*/
855
 
        mute_button = bacon_volume_button_new(GTK_ICON_SIZE_LARGE_TOOLBAR, 0, 100, 1);
 
866
        mute_button = gtk_volume_button_new();
856
867
        gtk_button_set_relief(GTK_BUTTON(mute_button), GTK_RELIEF_NORMAL);
857
868
        rec_button = gtk_button_new();
858
869
        /*help_button = gtk_button_new();*/
1033
1044
static gboolean
1034
1045
key_press_event_cb(GtkWidget *app, GdkEventKey *event, gpointer data)
1035
1046
{
1036
 
        int vol = (int)(bacon_volume_button_get_value(BACON_VOLUME_BUTTON(mute_button)) + 0.5f);
 
1047
        int vol = (int)(gtk_volume_button_get_value(mute_button) + 0.5f);
1037
1048
        
1038
1049
        switch (event->keyval)
1039
1050
        {
1062
1073
                                break;
1063
1074
                case GDK_KP_Add:
1064
1075
                case GDK_plus:  
1065
 
                                bacon_volume_button_set_value(BACON_VOLUME_BUTTON(mute_button), vol > 95 ? 100 : vol + 5);
 
1076
                                gtk_volume_button_set_value(mute_button, vol > 95 ? 100 : vol + 5);
1066
1077
                                /*gtk_adjustment_set_value(volume, (volume->value > 95) ? 100 : volume->value+5);*/
1067
1078
                                break;
1068
1079
                case GDK_minus:
1069
1080
                case GDK_KP_Subtract: 
1070
 
                                bacon_volume_button_set_value(BACON_VOLUME_BUTTON(mute_button), vol < 5 ? 0 : vol - 5);
 
1081
                                gtk_volume_button_set_value(mute_button, vol < 5 ? 0 : vol - 5);
1071
1082
                                /*gtk_adjustment_set_value(volume,(volume->value < 5) ? 0 : volume->value-5);*/
1072
1083
                                break;
1073
1084
        }