mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 14:36:24 +00:00
ext/gconf/gstgconfaudiosink.c: Fix warning when building without debug.
Original commit message from CVS: * ext/gconf/gstgconfaudiosink.c: Fix warning when building without debug. * sys/oss/gstossmixertrack.c: Use const like in alsamixertrack.c (fixes warnings).
This commit is contained in:
parent
eb2aee1b34
commit
5ff86cd792
3 changed files with 37 additions and 55 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-09-12 Stefan Kost <ensonic@users.sf.net>
|
||||
|
||||
* ext/gconf/gstgconfaudiosink.c:
|
||||
Fix warning when building without debug.
|
||||
|
||||
* sys/oss/gstossmixertrack.c:
|
||||
Use const like in alsamixertrack.c (fixes warnings).
|
||||
|
||||
2007-09-11 Wim Taymans <wim.taymans@gmail.com>
|
||||
|
||||
* sys/v4l2/v4l2src_calls.c:
|
||||
|
|
|
@ -206,10 +206,8 @@ gst_gconf_switch_profile (GstGConfAudioSink * sink, GstGConfProfile profile)
|
|||
return;
|
||||
|
||||
if (sink->connection) {
|
||||
const gchar *key = gst_gconf_get_key_for_sink_profile (sink->profile);
|
||||
|
||||
GST_DEBUG_OBJECT (sink, "Unsubscribing old key %s for profile %d",
|
||||
key, sink->profile);
|
||||
gst_gconf_get_key_for_sink_profile (sink->profile), sink->profile);
|
||||
gconf_client_notify_remove (sink->client, sink->connection);
|
||||
sink->connection = 0;
|
||||
}
|
||||
|
|
|
@ -84,9 +84,10 @@ fill_labels (void)
|
|||
{
|
||||
gint i, pos;
|
||||
gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
|
||||
struct
|
||||
const struct
|
||||
{
|
||||
gchar *given, *wanted;
|
||||
const gchar *given;
|
||||
const gchar *wanted;
|
||||
}
|
||||
cases[] = {
|
||||
/* Note: this list is simply ripped from soundcard.h. For
|
||||
|
@ -94,56 +95,31 @@ fill_labels (void)
|
|||
* etc.) - feel free to add them. That's the reason why
|
||||
* I'm doing this in such a horribly complicated way. */
|
||||
{
|
||||
"Vol ", _("Volume")}
|
||||
, {
|
||||
"Bass ", _("Bass")}
|
||||
, {
|
||||
"Trebl", _("Treble")}
|
||||
, {
|
||||
"Synth", _("Synth")}
|
||||
, {
|
||||
"Pcm ", _("PCM")}
|
||||
, {
|
||||
"Spkr ", _("Speaker")}
|
||||
, {
|
||||
"Line ", _("Line-in")}
|
||||
, {
|
||||
"Mic ", _("Microphone")}
|
||||
, {
|
||||
"CD ", _("CD")}
|
||||
, {
|
||||
"Mix ", _("Mixer")}
|
||||
, {
|
||||
"Pcm2 ", _("PCM-2")}
|
||||
, {
|
||||
"Rec ", _("Record")}
|
||||
, {
|
||||
"IGain", _("In-gain")}
|
||||
, {
|
||||
"OGain", _("Out-gain")}
|
||||
, {
|
||||
"Line1", _("Line-1")}
|
||||
, {
|
||||
"Line2", _("Line-2")}
|
||||
, {
|
||||
"Line3", _("Line-3")}
|
||||
, {
|
||||
"Digital1", _("Digital-1")}
|
||||
, {
|
||||
"Digital2", _("Digital-2")}
|
||||
, {
|
||||
"Digital3", _("Digital-3")}
|
||||
, {
|
||||
"PhoneIn", _("Phone-in")}
|
||||
, {
|
||||
"PhoneOut", _("Phone-out")}
|
||||
, {
|
||||
"Video", _("Video")}
|
||||
, {
|
||||
"Radio", _("Radio")}
|
||||
, {
|
||||
"Monitor", _("Monitor")}
|
||||
, {
|
||||
"Vol ", _("Volume")}, {
|
||||
"Bass ", _("Bass")}, {
|
||||
"Trebl", _("Treble")}, {
|
||||
"Synth", _("Synth")}, {
|
||||
"Pcm ", _("PCM")}, {
|
||||
"Spkr ", _("Speaker")}, {
|
||||
"Line ", _("Line-in")}, {
|
||||
"Mic ", _("Microphone")}, {
|
||||
"CD ", _("CD")}, {
|
||||
"Mix ", _("Mixer")}, {
|
||||
"Pcm2 ", _("PCM-2")}, {
|
||||
"Rec ", _("Record")}, {
|
||||
"IGain", _("In-gain")}, {
|
||||
"OGain", _("Out-gain")}, {
|
||||
"Line1", _("Line-1")}, {
|
||||
"Line2", _("Line-2")}, {
|
||||
"Line3", _("Line-3")}, {
|
||||
"Digital1", _("Digital-1")}, {
|
||||
"Digital2", _("Digital-2")}, {
|
||||
"Digital3", _("Digital-3")}, {
|
||||
"PhoneIn", _("Phone-in")}, {
|
||||
"PhoneOut", _("Phone-out")}, {
|
||||
"Video", _("Video")}, {
|
||||
"Radio", _("Radio")}, {
|
||||
"Monitor", _("Monitor")}, {
|
||||
NULL, NULL}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue