/*****************************************************************************
* waveout.c : Windows waveOut plugin for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: waveout.c,v 1.6 2002/08/30 23:27:06 massiot Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Gildas Bazin <gbazin@videolan.org>
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <fcntl.h> /* open(), O_WRONLY */
-#include <string.h> /* strerror() */
-#include <stdlib.h> /* calloc(), malloc(), free() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include "aout_internal.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+#include <vlc_charset.h>
+#include <windows.h>
#include <mmsystem.h>
-#define FRAME_SIZE 2048 /* The size is in samples, not in bytes */
+#define FRAME_SIZE 4096 /* The size is in samples, not in bytes */
+#define FRAMES_NUM 8
+
+/*****************************************************************************
+ * Useful macros
+ *****************************************************************************/
+#ifdef UNDER_CE
+# define DWORD_PTR DWORD
+# ifdef waveOutGetDevCaps
+# undef waveOutGetDevCaps
+ MMRESULT WINAPI waveOutGetDevCaps(UINT, LPWAVEOUTCAPS, UINT);
+# endif
+#endif
+
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+# define WAVE_FORMAT_IEEE_FLOAT 0x0003
+#endif
+
+#ifndef WAVE_FORMAT_DOLBY_AC3_SPDIF
+# define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
+#endif
+
+#ifndef WAVE_FORMAT_EXTENSIBLE
+#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
+#endif
+
+#ifndef SPEAKER_FRONT_LEFT
+# define SPEAKER_FRONT_LEFT 0x1
+# define SPEAKER_FRONT_RIGHT 0x2
+# define SPEAKER_FRONT_CENTER 0x4
+# define SPEAKER_LOW_FREQUENCY 0x8
+# define SPEAKER_BACK_LEFT 0x10
+# define SPEAKER_BACK_RIGHT 0x20
+# define SPEAKER_FRONT_LEFT_OF_CENTER 0x40
+# define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80
+# define SPEAKER_BACK_CENTER 0x100
+# define SPEAKER_SIDE_LEFT 0x200
+# define SPEAKER_SIDE_RIGHT 0x400
+# define SPEAKER_TOP_CENTER 0x800
+# define SPEAKER_TOP_FRONT_LEFT 0x1000
+# define SPEAKER_TOP_FRONT_CENTER 0x2000
+# define SPEAKER_TOP_FRONT_RIGHT 0x4000
+# define SPEAKER_TOP_BACK_LEFT 0x8000
+# define SPEAKER_TOP_BACK_CENTER 0x10000
+# define SPEAKER_TOP_BACK_RIGHT 0x20000
+# define SPEAKER_RESERVED 0x80000000
+#endif
+
+#ifndef _WAVEFORMATEXTENSIBLE_
+typedef struct {
+ WAVEFORMATEX Format;
+ union {
+ WORD wValidBitsPerSample; /* bits of precision */
+ WORD wSamplesPerBlock; /* valid if wBitsPerSample==0 */
+ WORD wReserved; /* If neither applies, set to zero. */
+ } Samples;
+ DWORD dwChannelMask; /* which channels are */
+ /* present in stream */
+ GUID SubFormat;
+} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
+#endif
+
+static const GUID __KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+static const GUID __KSDATAFORMAT_SUBTYPE_PCM = {WAVE_FORMAT_PCM, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+static const GUID __KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF = {WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
static void Play ( aout_instance_t * );
+/*****************************************************************************
+ * notification_thread_t: waveOut event thread
+ *****************************************************************************/
+typedef struct notification_thread_t
+{
+ VLC_COMMON_MEMBERS
+ aout_instance_t *p_aout;
+
+} notification_thread_t;
+
/* local functions */
-static int OpenWaveOut ( aout_instance_t *p_aout, int i_format,
- int i_channels, int i_rate );
+static void Probe ( aout_instance_t * );
+static int OpenWaveOut ( aout_instance_t *, uint32_t,
+ int, int, int, int, bool );
+static int OpenWaveOutPCM( aout_instance_t *, uint32_t,
+ int*, int, int, int, bool );
static int PlayWaveOut ( aout_instance_t *, HWAVEOUT, WAVEHDR *,
- aout_buffer_t * );
-static void CALLBACK WaveOutCallback ( HWAVEOUT h_waveout, UINT uMsg,
- DWORD _p_aout,
- DWORD dwParam1, DWORD dwParam2 );
+ aout_buffer_t *, bool );
+
+static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
+static void WaveOutThread( notification_thread_t * );
+
+static int VolumeInfos( aout_instance_t *, audio_volume_t * );
+static int VolumeGet( aout_instance_t *, audio_volume_t * );
+static int VolumeSet( aout_instance_t *, audio_volume_t );
+
+static int WaveOutClearDoneBuffers(aout_sys_t *p_sys);
+
+static int ReloadWaveoutDevices( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static uint32_t findDeviceID(char *);
+
+static const char psz_device_name_fmt[] = "%s ($%x,$%x)";
+
+static const char *const ppsz_adev[] = { "wavemapper", };
+static const char *const ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
+
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define FLOAT_TEXT N_("Use float32 output")
+#define FLOAT_LONGTEXT N_( \
+ "The option allows you to enable or disable the high-quality float32 " \
+ "audio output mode (which is not well supported by some soundcards)." )
+#define DEVICE_TEXT N_("Select Audio Device")
+#define DEVICE_LONG N_("Select special Audio device, or let windows "\
+ "decide (default), change needs VLC restart "\
+ "to apply.")
+#define DEFAULT_AUDIO_DEVICE N_("Default Audio Device")
+
vlc_module_begin();
- set_description( _("Win32 waveOut extension module") );
+ set_shortname( "WaveOut" );
+ set_description( N_("Win32 waveOut extension output") );
set_capability( "audio output", 50 );
+ set_category( CAT_AUDIO );
+ set_subcategory( SUBCAT_AUDIO_AOUT );
+ add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, true );
+
+ add_string( "waveout-dev", "wavemapper", NULL,
+ DEVICE_TEXT, DEVICE_LONG, false );
+ change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices );
+ change_need_restart();
+ change_action_add( ReloadWaveoutDevices, N_("Refresh list") );
+
+
set_callbacks( Open, Close );
vlc_module_end();
*****************************************************************************/
struct aout_sys_t
{
+ uint32_t i_wave_device_id; /* ID of selected output device */
+
HWAVEOUT h_waveout; /* handle to waveout instance */
- WAVEFORMATEX waveformat; /* audio format */
+ WAVEFORMATEXTENSIBLE waveformat; /* audio format */
- WAVEHDR waveheader[2];
+ WAVEHDR waveheader[FRAMES_NUM];
+
+ notification_thread_t *p_notif; /* WaveOutThread id */
+ HANDLE event;
+ HANDLE new_buffer_event;
+
+ // rental from alsa.c to synchronize startup of audiothread
+ int b_playing; /* playing status */
+ mtime_t start_date;
+
+ int i_repeat_counter;
int i_buffer_size;
- byte_t *p_silence_buffer; /* buffer we use to play silence */
+ uint8_t *p_silence_buffer; /* buffer we use to play silence */
+
+ bool b_chan_reorder; /* do we need channel reordering */
+ int pi_chan_table[AOUT_CHAN_MAX];
};
+static const uint32_t pi_channels_src[] =
+ { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+static const uint32_t pi_channels_in[] =
+ { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT,
+ SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT,
+ SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT,
+ SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, 0 };
+static const uint32_t pi_channels_out[] =
+ { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT,
+ SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY,
+ SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT,
+ SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT, 0 };
+
/*****************************************************************************
* Open: open the audio device
*****************************************************************************
* This function opens and setups Win32 waveOut
*****************************************************************************/
static int Open( vlc_object_t *p_this )
-{
+{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ vlc_value_t val;
+ int i;
/* Allocate structure */
p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
if( p_aout->output.p_sys == NULL )
+ return VLC_ENOMEM;
+
+ p_aout->output.pf_play = Play;
+ p_aout->b_die = false;
+
+
+ /*
+ initialize/update Device selection List
+ */
+ ReloadWaveoutDevices( p_this, "waveout-dev", val, val, NULL);
+
+
+ /*
+ check for configured audio device!
+ */
+ char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-dev");
+
+ p_aout->output.p_sys->i_wave_device_id =
+ findDeviceID( psz_waveout_dev );
+
+ if(p_aout->output.p_sys->i_wave_device_id == WAVE_MAPPER)
{
- msg_Err( p_aout, "out of memory" );
- return 1;
+ if(psz_waveout_dev &&
+ stricmp(psz_waveout_dev,"wavemapper"))
+ {
+ msg_Warn( p_aout, "configured audio device '%s' not available, "\
+ "use default instead", psz_waveout_dev );
+ }
+ }
+ free( psz_waveout_dev );
+
+
+ WAVEOUTCAPS waveoutcaps;
+ if(waveOutGetDevCaps( p_aout->output.p_sys->i_wave_device_id,
+ &waveoutcaps,
+ sizeof(WAVEOUTCAPS)) == MMSYSERR_NOERROR)
+ {
+ /* log debug some infos about driver, to know who to blame
+ if it doesn't work */
+ msg_Dbg( p_aout, "Drivername: %s", waveoutcaps.szPname);
+ msg_Dbg( p_aout, "Driver Version: %d.%d",
+ (waveoutcaps.vDriverVersion>>8)&255,
+ waveoutcaps.vDriverVersion & 255);
+ msg_Dbg( p_aout, "Manufacturer identifier: 0x%x", waveoutcaps.wMid );
+ msg_Dbg( p_aout, "Product identifier: 0x%x", waveoutcaps.wPid );
}
- p_aout->output.pf_play = Play;
- /* calculate the frame size in bytes */
- p_aout->output.p_sys->i_buffer_size = FRAME_SIZE * sizeof(s16)
- * p_aout->output.p_sys->waveformat.nChannels;
+
+ if( var_Type( p_aout, "audio-device" ) == 0 )
+ {
+ Probe( p_aout );
+ }
+
+ if( var_Get( p_aout, "audio-device", &val ) < 0 )
+ {
+ /* Probe() has failed. */
+ var_Destroy( p_aout, "waveout-device");
+ free( p_aout->output.p_sys );
+ return VLC_EGENERIC;
+ }
+
+
+ /* Open the device */
+ if( val.i_int == AOUT_VAR_SPDIF )
+ {
+ p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
+
+ if( OpenWaveOut( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ VLC_FOURCC('s','p','d','i'),
+ p_aout->output.output.i_physical_channels,
+ aout_FormatNbChannels( &p_aout->output.output ),
+ p_aout->output.output.i_rate, false )
+ != VLC_SUCCESS )
+ {
+ msg_Err( p_aout, "cannot open waveout audio device" );
+ free( p_aout->output.p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Calculate the frame size in bytes */
+ p_aout->output.i_nb_samples = A52_FRAME_NB;
+ p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE;
+ p_aout->output.output.i_frame_length = A52_FRAME_NB;
+ p_aout->output.p_sys->i_buffer_size =
+ p_aout->output.output.i_bytes_per_frame;
+
+ aout_VolumeNoneInit( p_aout );
+ }
+ else
+ {
+ WAVEOUTCAPS wocaps;
+
+ if( val.i_int == AOUT_VAR_5_1 )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_LFE;
+ }
+ else if( val.i_int == AOUT_VAR_2F2R )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ }
+ else if( val.i_int == AOUT_VAR_MONO )
+ {
+ p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
+ }
+ else
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ }
+
+ if( OpenWaveOutPCM( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ &p_aout->output.output.i_format,
+ p_aout->output.output.i_physical_channels,
+ aout_FormatNbChannels( &p_aout->output.output ),
+ p_aout->output.output.i_rate, false )
+ != VLC_SUCCESS )
+ {
+ msg_Err( p_aout, "cannot open waveout audio device" );
+ free( p_aout->output.p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Calculate the frame size in bytes */
+ p_aout->output.i_nb_samples = FRAME_SIZE;
+ aout_FormatPrepare( &p_aout->output.output );
+ p_aout->output.p_sys->i_buffer_size = FRAME_SIZE *
+ p_aout->output.output.i_bytes_per_frame;
+
+ aout_VolumeSoftInit( p_aout );
+
+ /* Check for hardware volume support */
+ if( waveOutGetDevCaps( (UINT_PTR)p_aout->output.p_sys->h_waveout,
+ &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR &&
+ wocaps.dwSupport & WAVECAPS_VOLUME )
+ {
+ DWORD i_dummy;
+ if( waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_dummy )
+ == MMSYSERR_NOERROR )
+ {
+ p_aout->output.pf_volume_infos = VolumeInfos;
+ p_aout->output.pf_volume_get = VolumeGet;
+ p_aout->output.pf_volume_set = VolumeSet;
+ }
+ }
+ }
+
+
+ waveOutReset( p_aout->output.p_sys->h_waveout );
+
/* Allocate silence buffer */
p_aout->output.p_sys->p_silence_buffer =
- calloc( p_aout->output.p_sys->i_buffer_size, 1 );
+ malloc( p_aout->output.p_sys->i_buffer_size );
if( p_aout->output.p_sys->p_silence_buffer == NULL )
{
- msg_Err( p_aout, "out of memory" );
+ free( p_aout->output.p_sys );
return 1;
}
+ p_aout->output.p_sys->i_repeat_counter = 0;
- /* We need to open the device with default values to be sure it is
- * available */
- if ( OpenWaveOut( p_aout, WAVE_FORMAT_PCM, 2, 44100 ) )
- {
- msg_Err( p_aout, "cannot open waveout" );
- return 1;
- }
- waveOutReset( p_aout->output.p_sys->h_waveout );
+ /* Zero the buffer. WinCE doesn't have calloc(). */
+ memset( p_aout->output.p_sys->p_silence_buffer, 0,
+ p_aout->output.p_sys->i_buffer_size );
- p_aout->output.output.i_format = AOUT_FMT_S16_NE;
- p_aout->output.i_nb_samples = FRAME_SIZE;
+ /* Now we need to setup our waveOut play notification structure */
+ p_aout->output.p_sys->p_notif =
+ vlc_object_create( p_aout, sizeof(notification_thread_t) );
+ p_aout->output.p_sys->p_notif->p_aout = p_aout;
+ p_aout->output.p_sys->event = CreateEvent( NULL, FALSE, FALSE, NULL );
+ p_aout->output.p_sys->new_buffer_event = CreateEvent( NULL, FALSE, FALSE, NULL );
+
+ /* define startpoint of playback on first call to play()
+ like alsa does (instead of playing a blank sample) */
+ p_aout->output.p_sys->b_playing = 0;
+ p_aout->output.p_sys->start_date = 0;
+
+
+ /* Then launch the notification thread */
+ if( vlc_thread_create( p_aout->output.p_sys->p_notif,
+ "waveOut Notification Thread", WaveOutThread,
+ VLC_THREAD_PRIORITY_OUTPUT, false ) )
+ {
+ msg_Err( p_aout, "cannot create WaveOutThread" );
+ }
/* We need to kick off the playback in order to have the callback properly
* working */
- PlayWaveOut( p_aout, p_aout->output.p_sys->h_waveout,
- &p_aout->output.p_sys->waveheader[0], NULL );
- PlayWaveOut( p_aout, p_aout->output.p_sys->h_waveout,
- &p_aout->output.p_sys->waveheader[1], NULL );
+ for( i = 0; i < FRAMES_NUM; i++ )
+ {
+ p_aout->output.p_sys->waveheader[i].dwFlags = WHDR_DONE;
+ p_aout->output.p_sys->waveheader[i].dwUser = 0;
+ }
return 0;
}
+/*****************************************************************************
+ * Probe: probe the audio device for available formats and channels
+ *****************************************************************************/
+static void Probe( aout_instance_t * p_aout )
+{
+ vlc_value_t val, text;
+ int i_format;
+ unsigned int i_physical_channels;
+
+ var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Audio Device");
+ var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
+
+ /* Test for 5.1 support */
+ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT |
+ AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
+ if( p_aout->output.output.i_physical_channels == i_physical_channels )
+ {
+ if( OpenWaveOutPCM( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ &i_format,
+ i_physical_channels, 6,
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_5_1;
+ text.psz_string = (char *)N_("5.1");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 5.1 channels" );
+ }
+ }
+
+ /* Test for 2 Front 2 Rear support */
+ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ if( ( p_aout->output.output.i_physical_channels & i_physical_channels )
+ == i_physical_channels )
+ {
+ if( OpenWaveOutPCM( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ &i_format,
+ i_physical_channels, 4,
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_2F2R;
+ text.psz_string = (char *)N_("2 Front 2 Rear");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 4 channels" );
+ }
+ }
+
+ /* Test for stereo support */
+ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ if( OpenWaveOutPCM( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ &i_format,
+ i_physical_channels, 2,
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_STEREO;
+ text.psz_string = (char *)N_("Stereo");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 2 channels" );
+ }
+
+ /* Test for mono support */
+ i_physical_channels = AOUT_CHAN_CENTER;
+ if( OpenWaveOutPCM( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ &i_format,
+ i_physical_channels, 1,
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_MONO;
+ text.psz_string = (char *)N_("Mono");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 1 channel" );
+ }
+
+ /* Test for SPDIF support */
+ if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
+ {
+ if( OpenWaveOut( p_aout,
+ p_aout->output.p_sys->i_wave_device_id,
+ VLC_FOURCC('s','p','d','i'),
+ p_aout->output.output.i_physical_channels,
+ aout_FormatNbChannels( &p_aout->output.output ),
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ msg_Dbg( p_aout, "device supports A/52 over S/PDIF" );
+ val.i_int = AOUT_VAR_SPDIF;
+ text.psz_string = (char *)N_("A/52 over S/PDIF");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ if( config_GetInt( p_aout, "spdif" ) )
+ var_Set( p_aout, "audio-device", val );
+ }
+ }
+
+ var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int <= 0 )
+ {
+ /* Probe() has failed. */
+ var_Destroy( p_aout, "audio-device" );
+ return;
+ }
+
+ var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
+
+ val.b_bool = true;
+ var_Set( p_aout, "intf-change", val );
+}
+
/*****************************************************************************
* Play: play a sound buffer
*****************************************************************************
* This doesn't actually play the buffer. This just stores the buffer so it
* can be played by the callback thread.
*****************************************************************************/
-static void Play( aout_instance_t *p_aout )
+static void Play( aout_instance_t *_p_aout )
{
+ if( !_p_aout->output.p_sys->b_playing )
+ {
+ _p_aout->output.p_sys->b_playing = 1;
+
+ /* get the playing date of the first aout buffer */
+ _p_aout->output.p_sys->start_date =
+ aout_FifoFirstDate( _p_aout, &_p_aout->output.fifo );
+
+ msg_Dbg( _p_aout, "Wakeup sleeping output thread.");
+
+ /* wake up the audio output thread */
+ SetEvent( _p_aout->output.p_sys->event );
+ } else {
+ SetEvent( _p_aout->output.p_sys->new_buffer_event );
+ }
}
/*****************************************************************************
* Close: close the audio device
*****************************************************************************/
static void Close( vlc_object_t *p_this )
-{
+{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ aout_sys_t *p_sys = p_aout->output.p_sys;
/* Before calling waveOutClose we must reset the device */
- waveOutReset( p_aout->output.p_sys->h_waveout );
+ vlc_object_kill( p_aout );
- /* Close the device */
- if( waveOutClose( p_aout->output.p_sys->h_waveout ) != MMSYSERR_NOERROR )
+ /* wake up the audio thread, to recognize that p_aout died */
+ SetEvent( p_sys->event );
+ SetEvent( p_sys->new_buffer_event );
+
+ vlc_thread_join( p_sys->p_notif );
+ vlc_object_release( p_sys->p_notif );
+
+ /*
+ kill the real output then - when the feed thread
+ is surely terminated!
+ old code could be too early in case that "feeding"
+ was running on termination
+
+ at this point now its sure, that there will be no new
+ data send to the driver, and we can cancel the last
+ running playbuffers
+ */
+ MMRESULT result = waveOutReset( p_sys->h_waveout );
+ if(result != MMSYSERR_NOERROR)
+ {
+ msg_Err( p_aout, "waveOutReset failed 0x%x", result );
+ /*
+ now we must wait, that all buffers are played
+ because cancel doesn't work in this case...
+ */
+ if(result == MMSYSERR_NOTSUPPORTED)
+ {
+ /*
+ clear currently played (done) buffers,
+ if returnvalue > 0 (means some buffer still playing)
+ wait for the driver event callback that one buffer
+ is finished with playing, and check again
+ the timeout of 5000ms is just, an emergency exit
+ of this loop, to avoid deadlock in case of other
+ (currently not known bugs, problems, errors cases?)
+ */
+ while(
+ (WaveOutClearDoneBuffers( p_sys ) > 0)
+ &&
+ (WaitForSingleObject( p_sys->event, 5000) == WAIT_OBJECT_0)
+ )
+ {
+ msg_Dbg( p_aout, "Wait for waveout device...");
+ }
+ }
+ } else {
+ WaveOutClearDoneBuffers( p_sys );
+ }
+
+ /* now we can Close the device */
+ if( waveOutClose( p_sys->h_waveout ) != MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutClose failed" );
}
- /* Free silence buffer */
- free( p_aout->output.p_sys->p_silence_buffer );
+ /*
+ because so long, the waveout device is playing, the callback
+ could occur and need the events
+ */
+ CloseHandle( p_sys->event );
+ CloseHandle( p_sys->new_buffer_event);
- if( p_aout->output.p_sys != NULL )
- {
- free( p_aout->output.p_sys );
- p_aout->output.p_sys = NULL;
- }
+ free( p_sys->p_silence_buffer );
+ free( p_sys );
}
/*****************************************************************************
* OpenWaveOut: open the waveout sound device
****************************************************************************/
-static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
- int i_channels, int i_rate )
+static int OpenWaveOut( aout_instance_t *p_aout, uint32_t i_device_id, int i_format,
+ int i_channels, int i_nb_channels, int i_rate,
+ bool b_probe )
{
MMRESULT result;
+ unsigned int i;
/* Set sound format */
- p_aout->output.p_sys->waveformat.wFormatTag = i_format;
- p_aout->output.p_sys->waveformat.nChannels = i_channels;
- p_aout->output.p_sys->waveformat.nSamplesPerSec = i_rate;
- p_aout->output.p_sys->waveformat.wBitsPerSample = 16;
- p_aout->output.p_sys->waveformat.nBlockAlign =
- p_aout->output.p_sys->waveformat.wBitsPerSample / 8 * i_channels;
- p_aout->output.p_sys->waveformat.nAvgBytesPerSec =
- p_aout->output.p_sys->waveformat.nSamplesPerSec *
- p_aout->output.p_sys->waveformat.nBlockAlign;
+
+#define waveformat p_aout->output.p_sys->waveformat
+
+ waveformat.dwChannelMask = 0;
+ for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
+ {
+ if( i_channels & pi_channels_src[i] )
+ waveformat.dwChannelMask |= pi_channels_in[i];
+ }
+
+ switch( i_format )
+ {
+ case VLC_FOURCC('s','p','d','i'):
+ i_nb_channels = 2;
+ /* To prevent channel re-ordering */
+ waveformat.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+ waveformat.Format.wBitsPerSample = 16;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
+ waveformat.SubFormat = __KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
+ break;
+
+ case VLC_FOURCC('f','l','3','2'):
+ waveformat.Format.wBitsPerSample = sizeof(float) * 8;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+ waveformat.SubFormat = __KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+ break;
+
+ case VLC_FOURCC('s','1','6','l'):
+ waveformat.Format.wBitsPerSample = 16;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
+ waveformat.SubFormat = __KSDATAFORMAT_SUBTYPE_PCM;
+ break;
+ }
+
+ waveformat.Format.nChannels = i_nb_channels;
+ waveformat.Format.nSamplesPerSec = i_rate;
+ waveformat.Format.nBlockAlign =
+ waveformat.Format.wBitsPerSample / 8 * i_nb_channels;
+ waveformat.Format.nAvgBytesPerSec =
+ waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign;
+
+ /* Only use the new WAVE_FORMAT_EXTENSIBLE format for multichannel audio */
+ if( i_nb_channels <= 2 )
+ {
+ waveformat.Format.cbSize = 0;
+ }
+ else
+ {
+ waveformat.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+ waveformat.Format.cbSize =
+ sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
+ }
+
+ if(!b_probe) {
+ msg_Dbg( p_aout, "OpenWaveDevice-ID: %u", i_device_id);
+ msg_Dbg( p_aout,"waveformat.Format.cbSize = %d",
+ waveformat.Format.cbSize);
+ msg_Dbg( p_aout,"waveformat.Format.wFormatTag = %u",
+ waveformat.Format.wFormatTag);
+ msg_Dbg( p_aout,"waveformat.Format.nChannels = %u",
+ waveformat.Format.nChannels);
+ msg_Dbg( p_aout,"waveformat.Format.nSamplesPerSec = %d",
+ (int)waveformat.Format.nSamplesPerSec);
+ msg_Dbg( p_aout,"waveformat.Format.nAvgBytesPerSec = %u",
+ (int)waveformat.Format.nAvgBytesPerSec);
+ msg_Dbg( p_aout,"waveformat.Format.nBlockAlign = %d",
+ waveformat.Format.nBlockAlign);
+ msg_Dbg( p_aout,"waveformat.Format.wBitsPerSample = %d",
+ waveformat.Format.wBitsPerSample);
+ msg_Dbg( p_aout,"waveformat.Samples.wValidBitsPerSample = %d",
+ waveformat.Samples.wValidBitsPerSample);
+ msg_Dbg( p_aout,"waveformat.Samples.wSamplesPerBlock = %d",
+ waveformat.Samples.wSamplesPerBlock);
+ msg_Dbg( p_aout,"waveformat.dwChannelMask = %lu",
+ waveformat.dwChannelMask);
+ }
/* Open the device */
- result = waveOutOpen( &p_aout->output.p_sys->h_waveout, WAVE_MAPPER,
- &p_aout->output.p_sys->waveformat,
+ result = waveOutOpen( &p_aout->output.p_sys->h_waveout, i_device_id,
+ (WAVEFORMATEX *)&waveformat,
(DWORD_PTR)WaveOutCallback, (DWORD_PTR)p_aout,
- CALLBACK_FUNCTION );
+ CALLBACK_FUNCTION | (b_probe?WAVE_FORMAT_QUERY:0) );
if( result == WAVERR_BADFORMAT )
{
- msg_Err( p_aout, "waveOutOpen failed WAVERR_BADFORMAT" );
- return( 1 );
+ msg_Warn( p_aout, "waveOutOpen failed WAVERR_BADFORMAT" );
+ return VLC_EGENERIC;
+ }
+ if( result == MMSYSERR_ALLOCATED )
+ {
+ msg_Warn( p_aout, "waveOutOpen failed WAVERR_ALLOCATED" );
+ return VLC_EGENERIC;
}
if( result != MMSYSERR_NOERROR )
{
- msg_Err( p_aout, "waveOutOpen failed" );
- return 1;
+ msg_Warn( p_aout, "waveOutOpen failed" );
+ return VLC_EGENERIC;
}
- return 0;
+ p_aout->output.p_sys->b_chan_reorder =
+ aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ waveformat.dwChannelMask, i_nb_channels,
+ p_aout->output.p_sys->pi_chan_table );
+
+ if( p_aout->output.p_sys->b_chan_reorder )
+ {
+ msg_Dbg( p_aout, "channel reordering needed" );
+ }
+
+ return VLC_SUCCESS;
+
+#undef waveformat
+
+}
+
+/*****************************************************************************
+ * OpenWaveOutPCM: open a PCM waveout sound device
+ ****************************************************************************/
+static int OpenWaveOutPCM( aout_instance_t *p_aout, uint32_t i_device_id, int *i_format,
+ int i_channels, int i_nb_channels, int i_rate,
+ bool b_probe )
+{
+ bool b_use_float32 = var_CreateGetBool( p_aout, "waveout-float32");
+
+ if( !b_use_float32 || OpenWaveOut( p_aout, i_device_id, VLC_FOURCC('f','l','3','2'),
+ i_channels, i_nb_channels, i_rate, b_probe )
+ != VLC_SUCCESS )
+ {
+ if ( OpenWaveOut( p_aout, i_device_id, VLC_FOURCC('s','1','6','l'),
+ i_channels, i_nb_channels, i_rate, b_probe )
+ != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
+ else
+ {
+ *i_format = VLC_FOURCC('s','1','6','l');
+ return VLC_SUCCESS;
+ }
+ }
+ else
+ {
+ *i_format = VLC_FOURCC('f','l','3','2');
+ return VLC_SUCCESS;
+ }
}
/*****************************************************************************
* PlayWaveOut: play a buffer through the WaveOut device
*****************************************************************************/
static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout,
- WAVEHDR *p_waveheader, aout_buffer_t *p_buffer )
+ WAVEHDR *p_waveheader, aout_buffer_t *p_buffer,
+ bool b_spdif)
{
MMRESULT result;
/* Prepare the buffer */
if( p_buffer != NULL )
+ {
p_waveheader->lpData = p_buffer->p_buffer;
- else
+ /*
+ copy the buffer to the silence buffer :) so in case we don't
+ get the next buffer fast enough (I will repeat this one a time
+ for AC3 / DTS and SPDIF this will sound better instead of
+ a hickup)
+ */
+ if(b_spdif)
+ {
+ vlc_memcpy( p_aout->output.p_sys->p_silence_buffer,
+ p_buffer->p_buffer,
+ p_aout->output.p_sys->i_buffer_size );
+ p_aout->output.p_sys->i_repeat_counter = 2;
+ }
+ } else {
/* Use silence buffer instead */
+ if(p_aout->output.p_sys->i_repeat_counter)
+ {
+ p_aout->output.p_sys->i_repeat_counter--;
+ if(!p_aout->output.p_sys->i_repeat_counter)
+ {
+ vlc_memset( p_aout->output.p_sys->p_silence_buffer,
+ 0x00, p_aout->output.p_sys->i_buffer_size );
+ }
+ }
p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer;
+ }
- p_waveheader->dwUser = (DWORD_PTR)p_buffer;
+ p_waveheader->dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
p_waveheader->dwBufferLength = p_aout->output.p_sys->i_buffer_size;
p_waveheader->dwFlags = 0;
if( result != MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutPrepareHeader failed" );
- return 1;
+ return VLC_EGENERIC;
}
/* Send the buffer to the waveOut queue */
if( result != MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutWrite failed" );
- return 1;
+ return VLC_EGENERIC;
}
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
DWORD _p_aout,
DWORD dwParam1, DWORD dwParam2 )
{
- aout_instance_t * p_aout = (aout_instance_t *)_p_aout;
- WAVEHDR *p_waveheader = (WAVEHDR *)dwParam1;
- aout_buffer_t * p_buffer;
+ aout_instance_t *p_aout = (aout_instance_t *)_p_aout;
+ int i, i_queued_frames = 0;
if( uMsg != WOM_DONE ) return;
- /* Unprepare and free the buffer which has just been played */
- waveOutUnprepareHeader( h_waveout, p_waveheader, sizeof(WAVEHDR) );
- if( p_waveheader->dwUser )
- aout_BufferFree( (aout_buffer_t *)p_waveheader->dwUser );
+ if( !vlc_object_alive (p_aout) ) return;
+
+ /* Find out the current latency */
+ for( i = 0; i < FRAMES_NUM; i++ )
+ {
+ /* Check if frame buf is available */
+ if( !(p_aout->output.p_sys->waveheader[i].dwFlags & WHDR_DONE) )
+ {
+ i_queued_frames++;
+ }
+ }
+
+ /* Don't wake up the thread too much */
+ if( i_queued_frames <= FRAMES_NUM/2 )
+ SetEvent( p_aout->output.p_sys->event );
+}
+
+
+/****************************************************************************
+ * WaveOutClearDoneBuffers: Clear all done marked buffers, and free aout_bufer
+ ****************************************************************************
+ * return value is the number of still playing buffers in the queue
+ ****************************************************************************/
+static int WaveOutClearDoneBuffers(aout_sys_t *p_sys)
+{
+ WAVEHDR *p_waveheader = p_sys->waveheader;
+ int i_queued_frames = 0;
+
+ for( int i = 0; i < FRAMES_NUM; i++ )
+ {
+ if( (p_waveheader[i].dwFlags & WHDR_DONE) &&
+ p_waveheader[i].dwUser )
+ {
+ aout_buffer_t *p_buffer =
+ (aout_buffer_t *)(p_waveheader[i].dwUser);
+ /* Unprepare and free the buffers which has just been played */
+ waveOutUnprepareHeader( p_sys->h_waveout, &p_waveheader[i],
+ sizeof(WAVEHDR) );
+
+ if( p_waveheader[i].dwUser != 1 )
+ aout_BufferFree( p_buffer );
+
+ p_waveheader[i].dwUser = 0;
+ }
+
+ /* Check if frame buf is available */
+ if( !(p_waveheader[i].dwFlags & WHDR_DONE) )
+ {
+ i_queued_frames++;
+ }
+ }
+ return i_queued_frames;
+}
+
+/*****************************************************************************
+ * WaveOutThread: this thread will capture play notification events.
+ *****************************************************************************
+ * We use this thread to feed new audio samples to the sound card because
+ * we are not authorized to use waveOutWrite() directly in the waveout
+ * callback.
+ *****************************************************************************/
+static void WaveOutThread( notification_thread_t *p_notif )
+{
+ aout_instance_t *p_aout = p_notif->p_aout;
+ aout_sys_t *p_sys = p_aout->output.p_sys;
+ aout_buffer_t *p_buffer = NULL;
+ WAVEHDR *p_waveheader = p_sys->waveheader;
+ int i, i_queued_frames;
+ bool b_sleek;
+ mtime_t next_date;
+ uint32_t i_buffer_length = 64;
+
+ /* We don't want any resampling when using S/PDIF */
+ b_sleek = p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i');
+
+ // wait for first call to "play()"
+ while( !p_sys->start_date && vlc_object_alive (p_aout) )
+ WaitForSingleObject( p_sys->event, INFINITE );
+ if( !vlc_object_alive (p_aout) )
+ return;
+
+ msg_Dbg( p_aout, "will start to play in %"PRId64" us",
+ (p_sys->start_date - AOUT_PTS_TOLERANCE/4)-mdate());
+
+ // than wait a short time... before grabbing first frames
+ mwait( p_sys->start_date - AOUT_PTS_TOLERANCE/4 );
+
+#define waveout_warn(msg) msg_Warn( p_aout, "aout_OutputNextBuffer no buffer "\
+ "got next_date=%d ms, "\
+ "%d frames to play, "\
+ "starving? %d, %s",(int)(next_date/(mtime_t)1000), \
+ i_queued_frames, \
+ p_aout->output.b_starving, msg);
+ next_date = mdate();
+
+ while( vlc_object_alive (p_aout) )
+ {
+ /* Cleanup and find out the current latency */
+ i_queued_frames = WaveOutClearDoneBuffers( p_sys );
+
+ if( !vlc_object_alive (p_aout) ) return;
+
+ /* Try to fill in as many frame buffers as possible */
+ for( i = 0; i < FRAMES_NUM; i++ )
+ {
+ /* Check if frame buf is available */
+ if( p_waveheader[i].dwFlags & WHDR_DONE )
+ {
+ // next_date = mdate() + 1000000 * i_queued_frames /
+ // p_aout->output.output.i_rate * p_aout->output.i_nb_samples;
+
+ // the realtime has got our back-site:) to come in sync
+ if(next_date < mdate())
+ next_date = mdate();
+
+
+ /* Take into account the latency */
+ p_buffer = aout_OutputNextBuffer( p_aout,
+ next_date,
+ b_sleek );
+
+ if(!p_buffer)
+ {
+#if 0
+ msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "\
+ "got next_date=%d ms, "\
+ "%d frames to play, "\
+ "starving? %d",(int)(next_date/(mtime_t)1000),
+ i_queued_frames,
+ p_aout->output.b_starving);
+#endif
+ if(p_aout->output.b_starving)
+ {
+ // means we are too early to request a new buffer?
+ waveout_warn("waiting...")
+ next_date = aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
+ mwait( next_date - AOUT_PTS_TOLERANCE/4 );
+ next_date = mdate();
+ p_buffer = aout_OutputNextBuffer( p_aout,
+ next_date,
+ b_sleek
+ );
+ }
+ }
+
+ if( !p_buffer && i_queued_frames )
+ {
+ /* We aren't late so no need to play a blank sample */
+ break;
+ }
+
+ if( p_buffer )
+ {
+ mtime_t buffer_length = (p_buffer->end_date
+ - p_buffer->start_date);
+ next_date = next_date + buffer_length;
+ i_buffer_length = buffer_length/1000;
+ }
+
+ /* Do the channel reordering */
+ if( p_buffer && p_sys->b_chan_reorder )
+ {
+ aout_ChannelReorder( p_buffer->p_buffer,
+ p_buffer->i_nb_bytes,
+ p_sys->waveformat.Format.nChannels,
+ p_sys->pi_chan_table,
+ p_sys->waveformat.Format.wBitsPerSample );
+ }
+
+ PlayWaveOut( p_aout, p_sys->h_waveout,
+ &p_waveheader[i], p_buffer, b_sleek );
+
+ i_queued_frames++;
+ }
+ }
+
+ if( !vlc_object_alive (p_aout) ) return;
+
+ /*
+ deal with the case that the loop didn't fillup the buffer to the
+ max - instead of waiting that half the buffer is played before
+ fillup the waveout buffers, wait only for the next sample buffer
+ to arrive at the play method...
+
+ this will also avoid, that the last buffer is play until the
+ end, and then trying to get more data, so it will also
+ work - if the next buffer will arrive some ms before the
+ last buffer is finished.
+ */
+ if(i_queued_frames < FRAMES_NUM)
+ WaitForSingleObject( p_sys->new_buffer_event, INFINITE );
+ else
+ WaitForSingleObject( p_sys->event, INFINITE );
+
+ }
+
+#undef waveout_warn
+}
+
+static int VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
+{
+ *pi_soft = AOUT_VOLUME_MAX / 2;
+ return 0;
+}
+
+static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+{
+ DWORD i_waveout_vol;
+
+#ifdef UNDER_CE
+ waveOutGetVolume( 0, &i_waveout_vol );
+#else
+ waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_waveout_vol );
+#endif
+
+ i_waveout_vol &= 0xFFFF;
+ *pi_volume = p_aout->output.i_volume =
+ (i_waveout_vol * AOUT_VOLUME_MAX + 0xFFFF /*rounding*/) / 2 / 0xFFFF;
+ return 0;
+}
+
+static int VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+{
+ unsigned long i_waveout_vol = i_volume * 0xFFFF * 2 / AOUT_VOLUME_MAX;
+ i_waveout_vol |= (i_waveout_vol << 16);
+
+#ifdef UNDER_CE
+ waveOutSetVolume( 0, i_waveout_vol );
+#else
+ waveOutSetVolume( p_aout->output.p_sys->h_waveout, i_waveout_vol );
+#endif
+
+ p_aout->output.i_volume = i_volume;
+ return 0;
+}
+
+
+/*
+ reload the configuration drop down list, of the Audio Devices
+*/
+static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name,
+ vlc_value_t newval, vlc_value_t oldval, void *data )
+{
+ int i;
+
+ module_config_t *p_item = config_FindConfig( p_this, psz_name );
+ if( !p_item ) return VLC_SUCCESS;
+
+ /* Clear-up the current list */
+ if( p_item->i_list )
+ {
+ /* Keep the first entry */
+ for( i = 1; i < p_item->i_list; i++ )
+ {
+ free((char *)(p_item->ppsz_list[i]) );
+ free((char *)(p_item->ppsz_list_text[i]) );
+ }
+ /* TODO: Remove when no more needed */
+ p_item->ppsz_list[i] = NULL;
+ p_item->ppsz_list_text[i] = NULL;
+ }
+ p_item->i_list = 1;
+
+ int wave_devices = waveOutGetNumDevs();
+
+ p_item->ppsz_list =
+ (char **)realloc( p_item->ppsz_list,
+ (wave_devices+2) * sizeof(char *) );
+ p_item->ppsz_list_text =
+ (char **)realloc( p_item->ppsz_list_text,
+ (wave_devices+2) * sizeof(char *) );
+
+ WAVEOUTCAPS caps;
+ char sz_dev_name[MAXPNAMELEN+32];
+ int j=1;
+ for(int i=0; i<wave_devices; i++)
+ {
+ if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+ == MMSYSERR_NOERROR)
+ {
+ sprintf( sz_dev_name, psz_device_name_fmt, caps.szPname,
+ caps.wMid,
+ caps.wPid
+ );
+ p_item->ppsz_list[j] = FromLocaleDup( sz_dev_name );
+ p_item->ppsz_list_text[j] = FromLocaleDup( sz_dev_name );
+ p_item->i_list++;
+ j++;
+ }
+
+ }
+ p_item->ppsz_list[j] = NULL;
+ p_item->ppsz_list_text[j] = NULL;
- /* FIXME : take into account WaveOut latency instead of mdate() */
- p_buffer = aout_OutputNextBuffer( p_aout, mdate(), VLC_FALSE );
+ /* Signal change to the interface */
+ p_item->b_dirty = true;
+
+ return VLC_SUCCESS;
+}
+
+/*
+ convert devicename to device ID for output
+ if device not found return WAVE_MAPPER, so let
+ windows decide which preferred audio device
+ should be used.
+*/
+static uint32_t findDeviceID(char *psz_device_name)
+{
+ if(!psz_device_name)
+ return WAVE_MAPPER;
+
+ uint32_t wave_devices = waveOutGetNumDevs();
+ WAVEOUTCAPS caps;
+ char sz_dev_name[MAXPNAMELEN+32];
+ for(uint32_t i=0; i<wave_devices; i++)
+ {
+ if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+ == MMSYSERR_NOERROR)
+ {
+ sprintf(sz_dev_name, psz_device_name_fmt, caps.szPname,
+ caps.wMid,
+ caps.wPid
+ );
+ char *psz_temp = FromLocaleDup(sz_dev_name);
+
+ if( !stricmp(psz_temp, psz_device_name) )
+ {
+ LocaleFree( psz_temp );
+ return i;
+ }
+ LocaleFree( psz_temp );
+ }
+ }
- PlayWaveOut( p_aout, h_waveout, p_waveheader, p_buffer );
+ return WAVE_MAPPER;
}
projects / vlc / blobdiff