Changeset 8f3d5d03e6c625f3527e8e8dd9e5391180e2a398

Timestamp:

18/01/08 15:56:56 (9 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1200668216 +0000

git-parent:

[5c35841422ce3a8b843a3b05aae9c97fa36366da]

git-author:

Rafaël Carré <funman@videolan.org> 1200668216 +0000

Message:

alsa: sets period size before buffer size, patch by Matthias P. Nowak

Files:

• THANKS (modified) (1 diff)
• modules/audio_output/alsa.c (modified) (2 diffs)

THANKS

@@ -149 +149 @@
-Mathias Kretschmer <mathias at research.att.com> - IP Multicast support
-Mats Rojestal <mats.rojestal at bredband dot net> - compilation fixes for Solaris 9
+Matthias P. Nowak <mpnowak at broadpark dot no> - ALSA 5.1 fix
-Matthieu Lochegnies <prof at tocard dot org> - MPEG audio emphasis fix
-Max Rudberg <max_08 at mac.com> - Mac OS X controller art (v0.7.0)

modules/audio_output/alsa.c

@@ -586 +586 @@
-        }
-
-        /* Set buffer size. */
-#ifdef HAVE_ALSA_NEW_API
-        if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
-                                    p_hw, &i_buffer_size ) ) < 0 )
-#else
-        if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
-                                    p_hw, i_buffer_size ) ) < 0 )
-#endif
-        {
-            msg_Err( p_aout, "unable to set buffer size (%s)",
-                         snd_strerror( i_snd_rc ) );
-            goto error;
-        }
-
-        /* Set period size. */
-#ifdef HAVE_ALSA_NEW_API
@@ -614 +600 @@
-        }
-        p_aout->output.i_nb_samples = i_period_size;
+
+/* Set buffer size. */
+#ifdef HAVE_ALSA_NEW_API
+        if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
+                                    p_hw, &i_buffer_size ) ) < 0 )
+#else
+        if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
+                                    p_hw, i_buffer_size ) ) < 0 )
+#endif
+        {
+            msg_Err( p_aout, "unable to set buffer size (%s)",
+                         snd_strerror( i_snd_rc ) );
+            goto error;
+        }
-
-        /* Commit hardware parameters. */