← Back to branch summary

~ubuntu-branches/debian/sid/gnome-media/sid

« back to all changes in this revision

Viewing changes to gnome-volume-control/src/gvc-channel-bar.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-04-05 18:05:02 UTC
  • mfrom: (1.1.39 upstream)
  • Revision ID: james.westby@ubuntu.com-20100405180502-ob0mizqw11ykao52
Tags: 2.30.0-1
* New upstream stable release:
  + debian/control.in:
    - Update build dependencies.
  + debian/libgnome-media0.install:
    - Update path for Glade 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-volume-control/src/gvc-channel-bar.c
37
37
#define ADJUSTMENT_MAX_NORMAL 65536.0 /* PA_VOLUME_NORM */
38
38
#define ADJUSTMENT_MAX_AMPLIFIED 98304.0 /* 1.5 * ADJUSTMENT_MAX_NORMAL */
39
39
#define ADJUSTMENT_MAX (bar->priv->is_amplified ? ADJUSTMENT_MAX_AMPLIFIED : ADJUSTMENT_MAX_NORMAL)
 
40
#define SCROLLSTEP (ADJUSTMENT_MAX / 100.0 * 5.0)
40
41
 
41
42
#define GVC_CHANNEL_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_BAR, GvcChannelBarPrivate))
42
43
 
411
412
 
412
413
        value = gtk_adjustment_get_value (adj);
413
414
 
414
 
        if (bar->priv->show_mute == FALSE) {
415
 
                /* this means the adjustment moved away from zero and
416
 
                 * therefore we should unmute and set the volume. */
417
 
                if (value > 0)
418
 
                        gvc_channel_bar_set_is_muted (bar, FALSE);
419
 
                else
420
 
                        gvc_channel_bar_set_is_muted (bar, TRUE);
421
 
        }
 
415
        /* this means the adjustment moved away from zero and
 
416
         * therefore we should unmute and set the volume. */
 
417
        gvc_channel_bar_set_is_muted (bar, (value == 0.0));
422
418
 
423
419
        /* Play a sound! */
424
420
        ca_gtk_play_for_widget (GTK_WIDGET (bar), 0,
453
449
        value = gtk_adjustment_get_value (adj);
454
450
 
455
451
        if (direction == GDK_SCROLL_UP) {
456
 
                if (value + ADJUSTMENT_MAX/100.0 > ADJUSTMENT_MAX)
 
452
                if (value + SCROLLSTEP > ADJUSTMENT_MAX)
457
453
                        value = ADJUSTMENT_MAX;
458
454
                else
459
 
                        value = value + ADJUSTMENT_MAX/100.0;
 
455
                        value = value + SCROLLSTEP;
460
456
        } else if (direction == GDK_SCROLL_DOWN) {
461
 
                if (value - ADJUSTMENT_MAX/100.0 < 0)
 
457
                if (value - SCROLLSTEP < 0)
462
458
                        value = 0.0;
463
459
                else
464
 
                        value = value - ADJUSTMENT_MAX/100.0;
 
460
                        value = value - SCROLLSTEP;
465
461
        }
466
462
 
467
463
        gvc_channel_bar_set_is_muted (bar, (value == 0.0));
596
592
                        str = g_strdup_printf ("<small>%s</small>", C_("volume", "Unamplified"));
597
593
                        gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), bar->priv->base_volume,
598
594
                                            GTK_POS_BOTTOM, str);
 
595
                        /* Only show 100% if it's higher than the base volume */
 
596
                        if (bar->priv->base_volume < ADJUSTMENT_MAX_NORMAL) {
 
597
                                str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
 
598
                                gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
 
599
                                                    GTK_POS_BOTTOM, str);
 
600
                        }
599
601
                }
600
602
 
601
603
                g_free (str);