Commit 43d9cf9d authored by Rémi Duraffort's avatar Rémi Duraffort

qt4: missing undefs.

parent 087ea0d0
...@@ -571,6 +571,7 @@ QFrame *AbstractController::telexFrame() ...@@ -571,6 +571,7 @@ QFrame *AbstractController::telexFrame()
#undef SET_MAPPING #undef SET_MAPPING
#undef CONNECT_MAP_SET #undef CONNECT_MAP_SET
#undef BUTTON_SET_BAR #undef BUTTON_SET_BAR
#undef BUTTON_SET_BAR2
#undef ENABLE_ON_VIDEO #undef ENABLE_ON_VIDEO
#undef ENABLE_ON_INPUT #undef ENABLE_ON_INPUT
......
...@@ -550,6 +550,10 @@ InputStatsPanel::InputStatsPanel( QWidget *parent, ...@@ -550,6 +550,10 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
"0", audio, "" ); "0", audio, "" );
CREATE_AND_ADD_TO_CAT( alost_stat, qtr("Lost buffers"), "0", audio, "" ); CREATE_AND_ADD_TO_CAT( alost_stat, qtr("Lost buffers"), "0", audio, "" );
#undef CREATE_AND_ADD_TO_CAT
#undef CREATE_CATEGORY
#undef CREATE_TREE_ITEM
input->setExpanded( true ); input->setExpanded( true );
video->setExpanded( true ); video->setExpanded( true );
streaming->setExpanded( true ); streaming->setExpanded( true );
...@@ -600,6 +604,8 @@ void InputStatsPanel::update( input_item_t *p_item ) ...@@ -600,6 +604,8 @@ void InputStatsPanel::update( input_item_t *p_item )
UPDATE( aplayed_stat, "%5i", p_item->p_stats->i_played_abuffers ); UPDATE( aplayed_stat, "%5i", p_item->p_stats->i_played_abuffers );
UPDATE( alost_stat, "%5i", p_item->p_stats->i_lost_abuffers ); UPDATE( alost_stat, "%5i", p_item->p_stats->i_lost_abuffers );
#undef UPDATE
vlc_mutex_unlock(& p_item->p_stats->lock ); vlc_mutex_unlock(& p_item->p_stats->lock );
} }
......
...@@ -387,6 +387,8 @@ void DiscOpenPanel::updateButtons() ...@@ -387,6 +387,8 @@ void DiscOpenPanel::updateButtons()
updateMRL(); updateMRL();
} }
#undef setDrive
/* Update the current MRL */ /* Update the current MRL */
void DiscOpenPanel::updateMRL() void DiscOpenPanel::updateMRL()
{ {
...@@ -1073,7 +1075,8 @@ void CaptureOpenPanel::initialize() ...@@ -1073,7 +1075,8 @@ void CaptureOpenPanel::initialize()
CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() ); CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() );
CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() ); CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
#undef addModule #undef CuMRL
#undef addModuleAndLayouts
} }
CaptureOpenPanel::~CaptureOpenPanel() CaptureOpenPanel::~CaptureOpenPanel()
......
...@@ -84,6 +84,8 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma ...@@ -84,6 +84,8 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma
spref_cone_Input_64.png, 4 ); spref_cone_Input_64.png, 4 );
ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 ); ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
#undef ADD_CATEGORY
SPrefsInterface->setChecked( true ); SPrefsInterface->setChecked( true );
layout->setMargin( 0 ); layout->setMargin( 0 );
layout->setSpacing( 1 ); layout->setSpacing( 1 );
...@@ -279,6 +281,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -279,6 +281,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
optionWidgets.append( NULL ); optionWidgets.append( NULL );
#endif #endif
#undef audioControl2
#undef audioControl
#undef audioCommon
/* Audio Options */ /* Audio Options */
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume ); defaultVolume );
...@@ -407,6 +413,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -407,6 +413,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
addToCachingBox( N_("Normal"), CachingNormal ); addToCachingBox( N_("Normal"), CachingNormal );
addToCachingBox( N_("High latency"), CachingHigh ); addToCachingBox( N_("High latency"), CachingHigh );
addToCachingBox( N_("Higher latency"), CachingHigher ); addToCachingBox( N_("Higher latency"), CachingHigher );
#undef addToCachingBox
#define TestCaC( name ) \ #define TestCaC( name ) \
b_cache_equal = b_cache_equal && \ b_cache_equal = b_cache_equal && \
...@@ -446,6 +453,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -446,6 +453,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
TestCaCi( "mms-caching", 19 ); TestCaCi( "mms-caching", 19 );
if( b_cache_equal ) ui.cachingCombo->setCurrentIndex( if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
ui.cachingCombo->findData( QVariant( i_cache ) ) ); ui.cachingCombo->findData( QVariant( i_cache ) ) );
#undef TestCaCi
#undef TestCaC
END_SPREFS_CAT; END_SPREFS_CAT;
/******************* /*******************
...@@ -593,6 +602,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -593,6 +602,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
} }
setLayout( panel_layout ); setLayout( panel_layout );
#undef END_SPREFS_CAT
#undef START_SPREFS_CAT
#undef CONFIG_GENERIC_FILE
#undef CONFIG_GENERIC_NO_BOOL
#undef CONFIG_GENERIC2
#undef CONFIG_GENERIC
} }
void SPrefsPanel::updateAudioOptions( int number) void SPrefsPanel::updateAudioOptions( int number)
...@@ -685,6 +701,8 @@ void SPrefsPanel::apply() ...@@ -685,6 +701,8 @@ void SPrefsPanel::apply()
//CaCi( "dv-caching" ) too short... //CaCi( "dv-caching" ) too short...
} }
break; break;
#undef CaC
#undef CaCi
} }
/* Interfaces */ /* Interfaces */
...@@ -817,6 +835,10 @@ void SPrefsPanel::assoDialog() ...@@ -817,6 +835,10 @@ void SPrefsPanel::assoDialog()
Qt::Checked : Qt::PartiallyChecked ) Qt::Checked : Qt::PartiallyChecked )
: Qt::Unchecked ); : Qt::Unchecked );
#undef aTo
#undef aTv
#undef aTa
QDialogButtonBox *buttonBox = new QDialogButtonBox( d ); QDialogButtonBox *buttonBox = new QDialogButtonBox( d );
QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) ); QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) );
QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) ); QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) );
......
...@@ -260,6 +260,7 @@ inline void VLCProfileEditor::registerCodecs() ...@@ -260,6 +260,7 @@ inline void VLCProfileEditor::registerCodecs()
ADD_VCODEC( "M-JPEG", "MJPG" ) ADD_VCODEC( "M-JPEG", "MJPG" )
ADD_VCODEC( "Theora", "theo" ) ADD_VCODEC( "Theora", "theo" )
ADD_VCODEC( "Dirac", "drac" ) ADD_VCODEC( "Dirac", "drac" )
#undef ADD_VCODEC
#define ADD_ACODEC( name, fourcc ) ui.aCodecBox->addItem( name, QVariant( fourcc ) ); #define ADD_ACODEC( name, fourcc ) ui.aCodecBox->addItem( name, QVariant( fourcc ) );
ADD_ACODEC( "MPEG Audio", "mpga" ) ADD_ACODEC( "MPEG Audio", "mpga" )
...@@ -271,6 +272,7 @@ inline void VLCProfileEditor::registerCodecs() ...@@ -271,6 +272,7 @@ inline void VLCProfileEditor::registerCodecs()
ADD_ACODEC( "Speex", "spx" ) ADD_ACODEC( "Speex", "spx" )
ADD_ACODEC( "WAV", "s16l" ) ADD_ACODEC( "WAV", "s16l" )
ADD_ACODEC( "WMA", "wma" ) ADD_ACODEC( "WMA", "wma" )
#undef ADD_ACODEC
#define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor ); #define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor );
ADD_SCALING( "1" ) ADD_SCALING( "1" )
...@@ -281,16 +283,19 @@ inline void VLCProfileEditor::registerCodecs() ...@@ -281,16 +283,19 @@ inline void VLCProfileEditor::registerCodecs()
ADD_SCALING( "1.5" ) ADD_SCALING( "1.5" )
ADD_SCALING( "1.75" ) ADD_SCALING( "1.75" )
ADD_SCALING( "2" ) ADD_SCALING( "2" )
#undef ADD_SCALING
#define ADD_SAMPLERATE( sample ) ui.aSampleBox->addItem( sample ); #define ADD_SAMPLERATE( sample ) ui.aSampleBox->addItem( sample );
ADD_SAMPLERATE( "11250" ) ADD_SAMPLERATE( "11250" )
ADD_SAMPLERATE( "22500" ) ADD_SAMPLERATE( "22500" )
ADD_SAMPLERATE( "44100" ) ADD_SAMPLERATE( "44100" )
ADD_SAMPLERATE( "48000" ) ADD_SAMPLERATE( "48000" )
#undef ADD_SAMPLERATE
#define ADD_SCODEC( name, fourcc ) ui.subsCodecBox->addItem( name, QVariant( fourcc ) ); #define ADD_SCODEC( name, fourcc ) ui.subsCodecBox->addItem( name, QVariant( fourcc ) );
ADD_SCODEC( "DVB subtitle", "dvbs" ) ADD_SCODEC( "DVB subtitle", "dvbs" )
ADD_SCODEC( "T.140", "t140" ) ADD_SCODEC( "T.140", "t140" )
#undef ADD_SCODEC
} }
void VLCProfileEditor::fillProfile( const QString& qs ) void VLCProfileEditor::fillProfile( const QString& qs )
...@@ -385,7 +390,8 @@ QString VLCProfileEditor::transcodeValue() ...@@ -385,7 +390,8 @@ QString VLCProfileEditor::transcodeValue()
SMUX( FLVMux, "flv" ) SMUX( FLVMux, "flv" )
SMUX( MKVMux, "mkv" ) SMUX( MKVMux, "mkv" )
SMUX( AVIMux, "avi" ) SMUX( AVIMux, "avi" )
SMUX( MJPEGMux, "mjpg" ); SMUX( MJPEGMux, "mjpg" ){}
#undef SMUX
#define currentData( box ) box->itemData( box->currentIndex() ) #define currentData( box ) box->itemData( box->currentIndex() )
QString qs_acodec, qs_vcodec; QString qs_acodec, qs_vcodec;
...@@ -416,6 +422,7 @@ QString VLCProfileEditor::transcodeValue() ...@@ -416,6 +422,7 @@ QString VLCProfileEditor::transcodeValue()
<< currentData( ui.subsCodecBox ).toString() << currentData( ui.subsCodecBox ).toString()
<< QString::number( ui.subsOverlay->isChecked() ); << QString::number( ui.subsOverlay->isChecked() );
#undef currentData
return transcodeMRL.join( ";" ); return transcodeMRL.join( ";" );
} }
......
...@@ -76,8 +76,8 @@ void SoutInputBox::setMRL( const QString& mrl ) ...@@ -76,8 +76,8 @@ void SoutInputBox::setMRL( const QString& mrl )
sourceValueLabel->setText( type ); sourceValueLabel->setText( type );
} }
#define CT( x ) connect( x, SIGNAL( textChanged( const QString& ) ), this, SIGNAL( mrlUpdated() ) ); #define CT( x ) connect( x, SIGNAL( textChanged( const QString& ) ), this, SIGNAL( mrlUpdated() ) );
#define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) ); #define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) );
/* FileDest Box */ /* FileDest Box */
FileDestBox::FileDestBox( QWidget *_parent ) : VirtualDestBox( _parent ) FileDestBox::FileDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
...@@ -380,6 +380,9 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent ) ...@@ -380,6 +380,9 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
CT( ICEPassEdit ); CT( ICEPassEdit );
} }
#undef CS
#undef CT
QString ICEDestBox::getMRL( const QString& mux ) QString ICEDestBox::getMRL( const QString& mux )
{ {
if( ICEEdit->text().isEmpty() ) return ""; if( ICEEdit->text().isEmpty() ) return "";
......
...@@ -79,10 +79,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& ...@@ -79,10 +79,10 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
BUTTONACT( ui.addButton, addDest() ); BUTTONACT( ui.addButton, addDest() );
// /* Connect everything to the updateMRL function */ // /* Connect everything to the updateMRL function */
#define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() ); #define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
#define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() ); #define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() );
#define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() ); #define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
#define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() ); #define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
/* Misc */ /* Misc */
CB( soutAll ); CB( soutKeep ); CS( ttl ); CT( sapName ); CT( sapGroup ); CB( soutAll ); CB( soutKeep ); CS( ttl ); CT( sapName ); CT( sapGroup );
...@@ -103,6 +103,11 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& ...@@ -103,6 +103,11 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
BUTTONACT( ui.nextButton2, next() ); BUTTONACT( ui.nextButton2, next() );
BUTTONACT( ui.prevButton, prev() ); BUTTONACT( ui.prevButton, prev() );
BUTTONACT( ui.prevButton2, prev() ); BUTTONACT( ui.prevButton2, prev() );
#undef CC
#undef CS
#undef CT
#undef CB
} }
void SoutDialog::next() void SoutDialog::next()
......
...@@ -1253,6 +1253,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu, ...@@ -1253,6 +1253,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
FREENULL( text.psz_string ); FREENULL( text.psz_string );
} }
#undef TEXT_OR_VAR
int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var, int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
vlc_object_t *p_object, bool b_root ) vlc_object_t *p_object, bool b_root )
......
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