macosx: move fullscreen-related method to VideoWindowCommon class

[vlc] / modules / audio_output / directx.c

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 2e02277ca52dea61024b60dbd9fe256725e35dca..32cdf840e0b1934dbb68c984ef258cc0ec4c272b 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -38,7 +38,7 @@
 
 #include "windows_audio_common.h"
 
-#define DS_BUF_SIZE (1024*1024)
+#define DS_BUF_SIZE (4*1024*1024)
 
 /*****************************************************************************
  * aout_sys_t: directx audio output method descriptor
@@ -64,8 +64,8 @@ struct aout_sys_t
         bool             mute;
     } volume;
 
-    int      i_bytes_per_sample;      /* Size in bytes of one frame */     
-    int      i_rate;                  /* Sample rate */ 
+    int      i_bytes_per_sample;      /* Size in bytes of one frame */
+    int      i_rate;                  /* Sample rate */
 
     uint8_t  chans_to_reorder;        /* do we need channel reordering */
     uint8_t  chan_table[AOUT_CHAN_MAX];
@@ -598,7 +598,7 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
                                            (void **) &p_aout->sys->p_notify )
             != DS_OK )
     {
-        
+
         msg_Err(p_aout, "Couldn't query IDirectSoundNotify");
         p_aout->sys->p_notify = NULL;
     }
@@ -619,9 +619,7 @@ static int CreateDSBufferPCM( audio_output_t *p_aout, vlc_fourcc_t *i_format,
 {
     unsigned i_nb_channels = popcount( i_channels );
 
-    /* Float32 audio samples are not supported for 5.1 output on the emu101k */
     if( !var_GetBool( p_aout, "directx-audio-float32" ) ||
-        i_nb_channels > 2 ||
         CreateDSBuffer( p_aout, VLC_CODEC_FL32,
                         i_channels, i_nb_channels, i_rate, b_probe )
         != VLC_SUCCESS )
@@ -901,7 +899,7 @@ static void Flush ( audio_output_t * aout, bool drain )
     else
     {
         IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer );
-        IDirectSoundBuffer_SetCurrentPosition( aout->sys->p_dsbuffer, 
+        IDirectSoundBuffer_SetCurrentPosition( aout->sys->p_dsbuffer,
                                                aout->sys->i_write );
     }
 }