]> git.pld-linux.org Git - packages/gnome-applets.git/blob - gnome-applets-mixer.patch
- fixes volume applet breakage introduced in 2.12.1
[packages/gnome-applets.git] / gnome-applets-mixer.patch
1 diff -aurN gnome-applets-2.12.1.orig/mixer/applet.c gnome-applets-2.12.1/mixer/applet.c
2 --- gnome-applets-2.12.1.orig/mixer/applet.c    2005-10-04 03:02:17.000000000 +0200
3 +++ gnome-applets-2.12.1/mixer/applet.c 2005-10-08 11:14:49.000000000 +0200
4 @@ -716,7 +716,7 @@
5        case GDK_SCROLL_UP:
6        case GDK_SCROLL_DOWN: {
7          GtkAdjustment *adj = gtk_range_get_adjustment (applet->dock->scale);
8 -        gfloat volume = adj->value;
9 +        gint volume = adj->value;
10  
11          if (event->direction == GDK_SCROLL_UP) {
12            volume += adj->step_increment;
13 @@ -942,7 +942,7 @@
14  void
15  gnome_volume_applet_adjust_volume (GstMixer *mixer,
16                                    GstMixerTrack *track,
17 -                                  float volume)
18 +                                  int volume)
19  {
20    int range = track->max_volume - track->min_volume;
21    float scale = ((float) range) / 100;
22 @@ -953,7 +953,7 @@
23  
24    volumes = g_new (gint, track->num_channels);
25    for (n = 0; n < track->num_channels; n++)
26 -    volumes[n] = lrintf (volume);
27 +    volumes[n] = volume;
28    gst_mixer_set_volume (mixer, track, volumes);
29    g_free (volumes);
30  }
31 @@ -989,8 +989,7 @@
32            gpointer data)
33  {
34    GnomeVolumeApplet *applet = data;
35 -  gint *volumes, n;
36 -  gfloat v;
37 +  gint *volumes, n, v;
38    GList *iter;
39  
40    if (applet->lock)
41 diff -aurN gnome-applets-2.12.1.orig/mixer/applet.h gnome-applets-2.12.1/mixer/applet.h
42 --- gnome-applets-2.12.1.orig/mixer/applet.h    2005-10-04 03:02:17.000000000 +0200
43 +++ gnome-applets-2.12.1/mixer/applet.h 2005-10-08 11:14:49.000000000 +0200
44 @@ -92,7 +92,7 @@
45  
46  void     gnome_volume_applet_adjust_volume (GstMixer      *mixer,
47                                             GstMixerTrack *track,
48 -                                           float          volume);
49 +                                           int            volume);
50  GType    gnome_volume_applet_get_type (void);
51  gboolean gnome_volume_applet_setup    (GnomeVolumeApplet *applet,
52                                        GList             *elements);
53 diff -aurN gnome-applets-2.12.1.orig/mixer/dock.c gnome-applets-2.12.1/mixer/dock.c
54 --- gnome-applets-2.12.1.orig/mixer/dock.c      2005-10-04 03:02:17.000000000 +0200
55 +++ gnome-applets-2.12.1/mixer/dock.c   2005-10-08 11:14:49.000000000 +0200
56 @@ -196,7 +196,7 @@
57  {
58    GnomeVolumeAppletDock *dock = data;
59    GtkAdjustment *adj;
60 -  gfloat volume;
61 +  gint volume;
62    gboolean res = TRUE;
63  
64    if (!dock->timeout)
This page took 0.078928 seconds and 3 git commands to generate.