From 948743037b36598a38a04889524fb93b8da65673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 23 Jan 2006 11:06:34 +0000
Subject: [PATCH] sys/sunaudio/: Export functions that are needed in other
 parts of the code, makes the mixer actually work; adjust mag...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* sys/sunaudio/gstsunaudiomixerctrl.c:
* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_init):
Export functions that are needed in other parts of the code,
makes the mixer actually work; adjust magic minimum buffer-time
value from 3ms to 5ms to work around stuttering during mp3
playback (#327765).
---
 ChangeLog                           | 11 +++++++++++
 sys/sunaudio/gstsunaudiomixerctrl.c |  6 +++---
 sys/sunaudio/gstsunaudiosink.c      |  8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5129d94bb..35a5c7a788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-23  Brian Cameron  <brian dot cameron at sun dot com>
+
+	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/sunaudio/gstsunaudiomixerctrl.c:
+	* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_init):
+	  Export functions that are needed in other parts of the code,
+	  makes the mixer actually work; adjust magic minimum buffer-time
+	  value from 3ms to 5ms to work around stuttering during mp3
+	  playback (#327765).
+
 2006-01-23  Michal Benes  <michal dot benes at xeris dot cz>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index adceac04be..7f88399f9e 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -132,7 +132,7 @@ gst_sunaudiomixer_ctrl_list_tracks (GstSunAudioMixerCtrl * mixer)
   return (const GList *) mixer->tracklist;
 }
 
-static void
+void
 gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtrl * mixer,
     GstMixerTrack * track, gint * volumes)
 {
@@ -199,7 +199,7 @@ gst_sunaudiomixer_ctrl_set_volume (GstSunAudioMixerCtrl * mixer,
   sunaudiotrack->vol = volume;
 }
 
-static void
+void
 gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl * sunaudio,
     GstMixerTrack * track, gboolean mute)
 {
@@ -239,7 +239,7 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl * sunaudio,
   }
 }
 
-static void
+void
 gst_sunaudiomixer_ctrl_set_record (GstSunAudioMixerCtrl * mixer,
     GstMixerTrack * track, gboolean record)
 {
diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c
index 9ddf0a21af..f791c4a55a 100644
--- a/sys/sunaudio/gstsunaudiosink.c
+++ b/sys/sunaudio/gstsunaudiosink.c
@@ -192,8 +192,8 @@ gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink)
   sunaudiosink->buffer_size = 8180;
 
   /*
-   * Reset the buffer-time to 3ms instead of the normal default of 500us
-   * (6 times larger, in other words).  
+   * Reset the buffer-time to 5ms instead of the normal default of 500us
+   * (10 times larger, in other words).  
    *
    * Setting a larger buffer causes the sinesrc to not stutter with this
    * sink.  The fact that SunAudio requires a larger buffer should be
@@ -204,8 +204,8 @@ gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink)
   g_value_init (&gvalue, G_TYPE_INT64);
   g_object_get_property (G_OBJECT (sunaudiosink), "buffer-time", &gvalue);
   buffer_time = g_value_get_int64 (&gvalue);
-  if (buffer_time < 3000000) {
-    g_value_set_int64 (&gvalue, 3000000);
+  if (buffer_time < 5000000) {
+    g_value_set_int64 (&gvalue, 5000000);
     g_object_set_property (G_OBJECT (sunaudiosink), "buffer-time", &gvalue);
   }