← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-media/maverick

« back to all changes in this revision

Viewing changes to gst-mixer/src/track.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Josselin Mouette, Luca Bruno
  • Date: 2009-05-28 00:05:41 UTC
  • mfrom: (0.1.28 upstream)
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: james.westby@ubuntu.com-20090528000541-s3h2g1jjw8sodkfi
Tags: 2.26.0-1
http://bugs.debian.org/523538
http://bugs.debian.org/526798
http://bugs.debian.org/502059
[ Josselin Mouette ]
* Set the team as primary maintainer. Closes: #523538.

[ Luca Bruno ]
* New upstream release. Closes: #526798.
  + Features a MP2 audio profile. Closes: #502059.
* debian/control.in:
  - Build-Depends:
    + Add libcanberra-gtk-dev 0.4.
    + Add libunique-dev.
    + Bump libglib2.0-dev to 2.18.2.
* debian/patches/01_vumeter_nodisplay.patch:
  - Remove, vu-meter isn't being built by default since 2.23.

[ Josselin Mouette ]
* Update build-dependencies, include libpulse.
* Explicitly enable the gst mixer.
* Install the autostart file in /usr/share/gnome/autostart.
* Install OMF and sound files.
* 10_applet_tryexec.patch: new patch. Only run 
  gnome-volume-control-applet when pulseaudio is installed.
* Split install targets for gnome-volume-control and gst-mixer. 
  Install selectively what comes from each of them.
* Install both gnome-volume-control.pulse and 
  gnome-volume-control.gstreamer. The real gnome-volume-control is now  
  a wrapper script.
* Depend on x11-utils for the wrapper script to work.
* Suggest pulseaudio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-mixer/src/track.c
37
37
} pix[] = {
38
38
  { "cd",         "media-optical"               },
39
39
  { "line",       "gvc-line-in"                 },
 
40
  { "aux",        "gvc-line-in"                 },
40
41
  { "mic",        "audio-input-microphone"      },
 
42
  { "cap",        "gvc-line-in"                 },
41
43
  { "mix",        "multimedia-volume-control"   },
42
44
  { "pcm",        "gvc-tone"                    },
43
45
  { "headphone",  "gvc-headphones"              },
44
46
  { "phone",      "phone"                       },
45
47
  { "speaker",    "audio-volume-high"           },
 
48
  { "front",      "audio-volume-high"           },
 
49
  { "surround",   "audio-volume-high"           },
 
50
  { "side",       "audio-volume-high"           },
 
51
  { "center",     "audio-volume-high"           },
 
52
  { "lfe",        "audio-volume-high"           },
46
53
  { "video",      "video-display"               },
47
54
  { "volume",     "gvc-tone"                    },
48
55
  { "master",     "gvc-tone"                    },
49
56
  { "3d",         "gvc-3d-sound"                },
 
57
  { "beep",       "keyboard"                    },
 
58
  { "record",     "audio-input-microphone"      },
50
59
  { NULL, NULL }
51
60
};
52
61
 
334
343
                                         GtkWidget *r_sep)
335
344
{
336
345
  GnomeVolumeControlTrack *ctrl;
337
 
  GtkWidget *slider;
338
 
  gint i, *volumes;
339
 
  GtkObject *adj;
340
 
  AtkObject *accessible;
341
 
  gchar *accessible_name;
342
346
 
343
347
  /* image, title */
344
348
  ctrl = gnome_volume_control_track_add_title (table, tab_pos,