Commit f6081e57 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: Kill more warnings.

parent 94c64e32
......@@ -201,7 +201,9 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
// Main module excluded
if( module_is_main( p_module) ) continue;
unsigned i_subcategory = 0, i_category = 0, confsize;
unsigned confsize;
int i_subcategory = 0, i_category = 0;
bool b_options = false;
module_config_t *const p_config = module_config_get (p_module, &confsize);
......
......@@ -38,7 +38,7 @@
SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
bool b_shiny )
: b_my_volume( false ), QWidget( _parent )
: QWidget( _parent ), b_my_volume( false )
{
p_intf = _p_intf;
QHBoxLayout *layout = new QHBoxLayout( this );
......@@ -159,14 +159,20 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
bool VolumeClickHandler::eventFilter( QObject *obj, QEvent *e )
{
VLC_UNUSED( obj );
if (e->type() == QEvent::MouseButtonPress )
{
aout_VolumeMute( p_intf, NULL );
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
// m->updateVolume( i_volume * VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
e->accept();
return true;
}
return false;
else
{
e->ignore();
return false;
}
}
......@@ -39,6 +39,7 @@
#include "qt4.hpp"
#include "input_manager.hpp"
#include "../../audio_filter/equalizer_presets.h"
#include <vlc_aout.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h>
......
......@@ -35,11 +35,10 @@
#include "ui/equalizer.h"
#include "ui/video_effects.h"
#include "ui/v4l2.h"
#include "../../audio_filter/equalizer_presets.h"
#include <QTabWidget>
#define BANDS EQZ_BANDS_MAX
#define BANDS 10
#define NUM_SP_CTRL 5
class QSignalMapper;
......
......@@ -49,6 +49,9 @@
#define I_DEVICE_TOOLTIP N_("Select the device or the VIDEO_TS directory")
static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
"dshow", "screen", "jack" };
/**************************************************************************
* Open Files and subtitles *
**************************************************************************/
......
......@@ -71,9 +71,6 @@ enum
JACK_DEVICE
};
static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
"dshow", "screen", "jack" };
class QWidget;
class QLineEdit;
class QString;
......
......@@ -816,12 +816,20 @@ void VLMWrapper::EditSchedule( const QString name, const QString input,
_schetime.toString( "hh:mm:ss" ) + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
if( _scherepeatnumber > 0 )
{
command = "setup \"" + name + "\" repeat \"" + _scherepeatnumber + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
}
if( _repeatDays > 0 )
{
command = "setup \"" + name + "\" period \"" + _repeatDays + "\"";
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
}
}
......
......@@ -640,6 +640,7 @@ void MainInterface::releaseVideoSlot( void )
/* Call from WindowControl function */
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
{
VLC_UNUSED( p_window ); //FIXME remove this param
int i_ret = VLC_SUCCESS;
switch( i_query )
{
......
......@@ -471,23 +471,11 @@ static void *Thread( void *obj )
static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
intf_dialog_args_t *p_arg )
{
VLC_UNUSED( p_intf );
DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
}
/*****************************************************************************
* PopupMenuCB: callback to show the popupmenu.
* We don't show the menu directly here because we don't want the
* caller to block for a too long time.
*****************************************************************************/
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 );
return VLC_SUCCESS;
}
/**
* Video output window provider
*/
......
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