From 2410cd7a003e4ce9977453c946152b9c9c80f20e Mon Sep 17 00:00:00 2001
From: James Andrewartha <trs80@ucc.gu.uwa.edu.au>
Date: Fri, 15 May 2009 08:44:39 +0200
Subject: Fix compiler warnings

Fixes bug #582715.
---
 sys/sunaudio/gstsunaudiomixerctrl.c  | 3 +++
 sys/sunaudio/gstsunaudiomixertrack.c | 1 -
 sys/sunaudio/gstsunaudiosrc.c        | 7 +++----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'sys/sunaudio')

diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index ea3950f3..c015c4c4 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -201,6 +201,9 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtrl * mixer,
       gain = (int) audioinfo.monitor_gain;
       balance = audioinfo.record.balance;
       break;
+    default:
+      g_assert_not_reached ();
+      break;
   }
 
   if (balance == AUDIO_MID_BALANCE) {
diff --git a/sys/sunaudio/gstsunaudiomixertrack.c b/sys/sunaudio/gstsunaudiomixertrack.c
index c903e01b..41275626 100644
--- a/sys/sunaudio/gstsunaudiomixertrack.c
+++ b/sys/sunaudio/gstsunaudiomixertrack.c
@@ -68,7 +68,6 @@ gst_sunaudiomixer_track_new (GstSunAudioTrackType track_num,
   GstMixerTrack *track;
   GObjectClass *klass;
   const gchar *untranslated_label;
-  gint volume;
 
   if ((guint) track_num < G_N_ELEMENTS (labels))
     untranslated_label = labels[track_num];
diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c
index 9f8ecc44..023b0990 100644
--- a/sys/sunaudio/gstsunaudiosrc.c
+++ b/sys/sunaudio/gstsunaudiosrc.c
@@ -312,8 +312,8 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc);
   audio_info_t ainfo;
   int ret;
-  int ctrl_fd = -1;
-  int ports;
+  GstSunAudioMixerCtrl *mixer;
+  struct audio_info audioinfo;
 
   ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo);
   if (ret == -1) {
@@ -333,8 +333,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   ainfo.record.encoding = AUDIO_ENCODING_LINEAR;
   ainfo.record.buffer_size = spec->buffer_time;
 
-  GstSunAudioMixerCtrl *mixer = sunaudiosrc->mixer;
-  struct audio_info audioinfo;
+  mixer = sunaudiosrc->mixer;
 
   if (ioctl (mixer->mixer_fd, AUDIO_GETINFO, &audioinfo) < 0) {
     g_warning ("Error getting audio device volume");
-- 
cgit