Commit 607d0272 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

dshow: fix warnings

parent b5386f68
...@@ -2013,7 +2013,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) ...@@ -2013,7 +2013,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
* config variable callback * config variable callback
*****************************************************************************/ *****************************************************************************/
static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
vlc_value_t newval, vlc_value_t oldval, void * ) vlc_value_t, vlc_value_t, void * )
{ {
module_config_t *p_item; module_config_t *p_item;
bool b_audio = false; bool b_audio = false;
...@@ -2075,7 +2075,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, ...@@ -2075,7 +2075,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
} }
static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name,
vlc_value_t newval, vlc_value_t oldval, void * ) vlc_value_t newval, vlc_value_t, void * )
{ {
module_config_t *p_item; module_config_t *p_item;
bool b_audio = false; bool b_audio = false;
...@@ -2285,8 +2285,9 @@ static void ShowTunerProperties( vlc_object_t *p_this, ...@@ -2285,8 +2285,9 @@ static void ShowTunerProperties( vlc_object_t *p_this,
static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph, static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph,
IBaseFilter *p_device_filter ) IBaseFilter *p_device_filter )
{ {
int i_channel, i_country, i_input, i_amtuner_mode, i_standard, i_frequency; int i_channel, i_country, i_input, i_amtuner_mode, i_standard;
long l_modes = 0; long l_modes = 0;
unsigned i_frequency;
IAMTVTuner *p_TV; IAMTVTuner *p_TV;
HRESULT hr; HRESULT hr;
...@@ -2380,9 +2381,10 @@ static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph, ...@@ -2380,9 +2381,10 @@ static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph,
goto free_on_error; goto free_on_error;
} }
msg_Dbg( p_this, "Frequency range supproted from %d to %d.", ModeCaps.MinFrequency, ModeCaps.MaxFrequency); msg_Dbg( p_this, "Frequency range supported from %ld to %ld.",
msg_Dbg( p_this, "Video standards supproted by the tuner: "); ModeCaps.MinFrequency, ModeCaps.MaxFrequency);
for(int i = 0 ; i < ARRAY_SIZE(ppsz_standards_list_text); i++) { msg_Dbg( p_this, "Video standards supported by the tuner: ");
for(size_t i = 0 ; i < ARRAY_SIZE(ppsz_standards_list_text); i++) {
if(ModeCaps.StandardsSupported & i_standards_list[i]) if(ModeCaps.StandardsSupported & i_standards_list[i])
msg_Dbg( p_this, "%s, ", ppsz_standards_list_text[i]); msg_Dbg( p_this, "%s, ", ppsz_standards_list_text[i]);
} }
......
...@@ -330,7 +330,7 @@ STDMETHODIMP_(ULONG) CapturePin::Release() ...@@ -330,7 +330,7 @@ STDMETHODIMP_(ULONG) CapturePin::Release()
}; };
/* IPin methods */ /* IPin methods */
STDMETHODIMP CapturePin::Connect( IPin * pReceivePin, STDMETHODIMP CapturePin::Connect( IPin *,
const AM_MEDIA_TYPE *pmt ) const AM_MEDIA_TYPE *pmt )
{ {
if( State_Running == p_filter->state ) if( State_Running == p_filter->state )
...@@ -562,7 +562,7 @@ STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum ) ...@@ -562,7 +562,7 @@ STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum )
return NOERROR; return NOERROR;
} }
STDMETHODIMP CapturePin::QueryInternalConnections( IPin* *apPin, ULONG *nPin ) STDMETHODIMP CapturePin::QueryInternalConnections( IPin**, ULONG * )
{ {
#ifdef DEBUG_DSHOW_L1 #ifdef DEBUG_DSHOW_L1
msg_Dbg( p_input, "CapturePin::QueryInternalConnections" ); msg_Dbg( p_input, "CapturePin::QueryInternalConnections" );
...@@ -602,9 +602,7 @@ STDMETHODIMP CapturePin::EndFlush( void ) ...@@ -602,9 +602,7 @@ STDMETHODIMP CapturePin::EndFlush( void )
return S_OK; return S_OK;
} }
STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart, STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME, REFERENCE_TIME, double )
REFERENCE_TIME tStop,
double dRate )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::NewSegment" ); msg_Dbg( p_input, "CapturePin::NewSegment" );
...@@ -613,7 +611,7 @@ STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart, ...@@ -613,7 +611,7 @@ STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart,
} }
/* IMemInputPin methods */ /* IMemInputPin methods */
STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator ) STDMETHODIMP CapturePin::GetAllocator( IMemAllocator ** )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::GetAllocator" ); msg_Dbg( p_input, "CapturePin::GetAllocator" );
...@@ -621,8 +619,7 @@ STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator ) ...@@ -621,8 +619,7 @@ STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator )
return VFW_E_NO_ALLOCATOR; return VFW_E_NO_ALLOCATOR;
} }
STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator, STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *, BOOL )
BOOL bReadOnly )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::NotifyAllocator" ); msg_Dbg( p_input, "CapturePin::NotifyAllocator" );
...@@ -630,7 +627,7 @@ STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator, ...@@ -630,7 +627,7 @@ STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator,
return S_OK; return S_OK;
} }
STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps ) STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES * )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" ); msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" );
...@@ -774,7 +771,7 @@ STDMETHODIMP_(ULONG) CaptureFilter::Release() ...@@ -774,7 +771,7 @@ STDMETHODIMP_(ULONG) CaptureFilter::Release()
}; };
/* IPersist method */ /* IPersist method */
STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID) STDMETHODIMP CaptureFilter::GetClassID(CLSID *)
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::GetClassID" ); msg_Dbg( p_input, "CaptureFilter::GetClassID" );
...@@ -783,7 +780,7 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID) ...@@ -783,7 +780,7 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID)
}; };
/* IMediaFilter methods */ /* IMediaFilter methods */
STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State) STDMETHODIMP CaptureFilter::GetState(DWORD, FILTER_STATE *State)
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::GetState %i", state ); msg_Dbg( p_input, "CaptureFilter::GetState %i", state );
...@@ -792,7 +789,7 @@ STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State) ...@@ -792,7 +789,7 @@ STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State)
*State = state; *State = state;
return S_OK; return S_OK;
}; };
STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *pClock) STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *)
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::SetSyncSource" ); msg_Dbg( p_input, "CaptureFilter::SetSyncSource" );
...@@ -829,7 +826,7 @@ STDMETHODIMP CaptureFilter::Pause() ...@@ -829,7 +826,7 @@ STDMETHODIMP CaptureFilter::Pause()
state = State_Paused; state = State_Paused;
return S_OK; return S_OK;
}; };
STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME tStart) STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME)
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::Run" ); msg_Dbg( p_input, "CaptureFilter::Run" );
...@@ -850,7 +847,7 @@ STDMETHODIMP CaptureFilter::EnumPins( IEnumPins ** ppEnum ) ...@@ -850,7 +847,7 @@ STDMETHODIMP CaptureFilter::EnumPins( IEnumPins ** ppEnum )
*ppEnum = new CaptureEnumPins( p_input, this, NULL ); *ppEnum = new CaptureEnumPins( p_input, this, NULL );
return *ppEnum == NULL ? E_OUTOFMEMORY : NOERROR; return *ppEnum == NULL ? E_OUTOFMEMORY : NOERROR;
}; };
STDMETHODIMP CaptureFilter::FindPin( LPCWSTR Id, IPin ** ppPin ) STDMETHODIMP CaptureFilter::FindPin( LPCWSTR, IPin ** )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::FindPin" ); msg_Dbg( p_input, "CaptureFilter::FindPin" );
...@@ -871,7 +868,7 @@ STDMETHODIMP CaptureFilter::QueryFilterInfo( FILTER_INFO * pInfo ) ...@@ -871,7 +868,7 @@ STDMETHODIMP CaptureFilter::QueryFilterInfo( FILTER_INFO * pInfo )
return NOERROR; return NOERROR;
}; };
STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph, STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph,
LPCWSTR pName ) LPCWSTR )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::JoinFilterGraph" ); msg_Dbg( p_input, "CaptureFilter::JoinFilterGraph" );
...@@ -881,7 +878,7 @@ STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph, ...@@ -881,7 +878,7 @@ STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph,
return NOERROR; return NOERROR;
}; };
STDMETHODIMP CaptureFilter::QueryVendorInfo( LPWSTR* pVendorInfo ) STDMETHODIMP CaptureFilter::QueryVendorInfo( LPWSTR* )
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::QueryVendorInfo" ); msg_Dbg( p_input, "CaptureFilter::QueryVendorInfo" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment