Commit 9b5404a6 authored by Rémi Duraffort's avatar Rémi Duraffort

Use VLC_VAR_CLASS when applicable.

parent bf8d85d7
...@@ -426,7 +426,7 @@ void ExtVideo::setWidgetValue( QObject *widget ) ...@@ -426,7 +426,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
"Module instance %s not found, looking in config values.", "Module instance %s not found, looking in config values.",
qtu( module ) ); qtu( module ) );
#endif #endif
i_type = config_GetType( p_intf, qtu( option ) ) & 0xf0; i_type = config_GetType( p_intf, qtu( option ) ) & VLC_VAR_CLASS;
switch( i_type ) switch( i_type )
{ {
case VLC_VAR_INTEGER: case VLC_VAR_INTEGER:
...@@ -443,7 +443,7 @@ void ExtVideo::setWidgetValue( QObject *widget ) ...@@ -443,7 +443,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
} }
else else
{ {
i_type = var_Type( p_obj, qtu( option ) ) & 0xf0; i_type = var_Type( p_obj, qtu( option ) ) & VLC_VAR_CLASS;
var_Get( p_obj, qtu( option ), &val ); var_Get( p_obj, qtu( option ), &val );
vlc_object_release( p_obj ); vlc_object_release( p_obj );
} }
...@@ -540,7 +540,7 @@ void ExtVideo::updateFilterOptions() ...@@ -540,7 +540,7 @@ void ExtVideo::updateFilterOptions()
QLineEdit *lineedit = qobject_cast<QLineEdit*> ( sender() ); QLineEdit *lineedit = qobject_cast<QLineEdit*> ( sender() );
QComboBox *combobox = qobject_cast<QComboBox*> ( sender() ); QComboBox *combobox = qobject_cast<QComboBox*> ( sender() );
i_type &= 0xf0; i_type &= VLC_VAR_CLASS;
if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL ) if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
{ {
int i_int = 0; int i_int = 0;
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
*****************************************************************************/ *****************************************************************************/
int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val ) int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val )
{ {
switch( i_type &= 0xf0 ) switch( i_type &= VLC_VAR_CLASS )
{ {
case VLC_VAR_VOID: case VLC_VAR_VOID:
vlclua_error( L ); vlclua_error( L );
...@@ -98,7 +98,7 @@ int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val ) ...@@ -98,7 +98,7 @@ int vlclua_pushvalue( lua_State *L, int i_type, vlc_value_t val )
static int vlclua_tovalue( lua_State *L, int i_type, vlc_value_t *val ) static int vlclua_tovalue( lua_State *L, int i_type, vlc_value_t *val )
{ {
switch( i_type & 0xf0 ) switch( i_type & VLC_VAR_CLASS )
{ {
case VLC_VAR_VOID: case VLC_VAR_VOID:
break; break;
......
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