Implement plugin support for OS/2

[vlc] / modules / audio_output / waveout.c

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 3d10416da3e1d8f67c1d4f8c9d7a0c3634a22dd3..f5a1975f1c77a654966da93e355a195322df02d1 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -60,7 +60,7 @@ static int OpenWaveOutPCM( audio_output_t *, uint32_t,
 static int PlayWaveOut   ( audio_output_t *, HWAVEOUT, WAVEHDR *,
                            aout_buffer_t *, bool );
 
-static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
+static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR );
 static void* WaveOutThread( void * );
 
 static int VolumeSet( audio_output_t *, float, bool );
@@ -92,14 +92,14 @@ vlc_module_begin ()
     set_capability( "audio output", 50 )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
 
     add_string( "waveout-audio-device", "wavemapper",
                  DEVICE_TEXT, DEVICE_LONG, false )
-       add_deprecated_alias( "waveout-dev" )   /* deprecated since 0.9.3 */
        change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices )
        change_action_add( ReloadWaveoutDevices, N_("Refresh list") )
 
+    add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
+
     set_callbacks( Open, Close )
 vlc_module_end ()
 
@@ -801,8 +801,8 @@ static int PlayWaveOut( audio_output_t *p_aout, HWAVEOUT h_waveout,
  * WaveOutCallback: what to do once WaveOut has played its sound samples
  *****************************************************************************/
 static void CALLBACK WaveOutCallback( HWAVEOUT h_waveout, UINT uMsg,
-                                      DWORD _p_aout,
-                                      DWORD dwParam1, DWORD dwParam2 )
+                                      DWORD_PTR _p_aout,
+                                      DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
 {
     (void)h_waveout;    (void)dwParam1;    (void)dwParam2;
     audio_output_t *p_aout = (audio_output_t *)_p_aout;