Qt4: fix #3872

[vlc] / modules / gui / qt4 / components / extended_panels.cpp

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 3c1c990d7d2803733d3db1ee3304a30c0d39349e..3a05513f1bc38974ef9f85b1c5ffb4e8a5da3eae 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#define __STDC_FORMAT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -370,10 +372,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
     p_vout = THEMIM->getVout();
     if( p_vout )
     {
-        if( !strcmp( psz_filter_type, "sub-filter" ) )
-            var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
-        else
-            var_SetString( p_vout, psz_filter_type, psz_string );
+        var_SetString( p_vout, psz_filter_type, psz_string );
         vlc_object_release( p_vout );
     }
 
@@ -406,10 +405,10 @@ void ExtVideo::initComboBoxItems( QObject *widget )
         {
             if( i_type == CONFIG_ITEM_INTEGER
              || i_type == CONFIG_ITEM_BOOL )
-                combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+                combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
                                    p_item->pi_list[i_index] );
             else if( i_type == CONFIG_ITEM_STRING )
-                combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+                combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
                                    p_item->ppsz_list[i_index] );
         }
     }
@@ -483,11 +482,11 @@ void ExtVideo::setWidgetValue( QObject *widget )
         else if( lineedit )
         {
             char str[30];
-            snprintf( str, sizeof(str), "%06X", val.i_int );
+            snprintf( str, sizeof(str), "%06"PRIX64, val.i_int );
             lineedit->setText( str );
         }
         else if( combobox ) combobox->setCurrentIndex(
-                            combobox->findData( val.i_int ) );
+                            combobox->findData( qlonglong(val.i_int) ) );
         else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
     }
     else if( i_type == VLC_VAR_FLOAT )
@@ -688,7 +687,7 @@ void ExtV4l2::Refresh( void )
             const char *psz_var = text.p_list->p_values[i].psz_string;
             var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &name, NULL );
             const char *psz_label = name.psz_string;
-            msg_Dbg( p_intf, "v4l2 control \"%x\": %s (%s)",
+            msg_Dbg( p_intf, "v4l2 control \"%"PRIx64"\": %s (%s)",
                      val.p_list->p_values[i].i_int, psz_var, name.psz_string );
 
             int i_type = var_Type( p_obj, psz_var );
@@ -712,7 +711,7 @@ void ExtV4l2::Refresh( void )
                         {
                             combobox->addItem(
                                        text2.p_list->p_values[j].psz_string,
-                                       val2.p_list->p_values[j].i_int );
+                                       qlonglong( val2.p_list->p_values[j].i_int) );
                             if( i_val == val2.p_list->p_values[j].i_int )
                                 combobox->setCurrentIndex( j );
                         }
@@ -1202,8 +1201,7 @@ Spatializer::~Spatializer()
 void Spatializer::enable()
 {
     bool en = enableCheck->isChecked();
-    aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer",
-            en ? true : false );
+    aout_EnableFilter( THEPL, "spatializer", en );
     enable( en );
 }
 
@@ -1300,8 +1298,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
     AVSpin = new QDoubleSpinBox;
     AVSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
     AVSpin->setDecimals( 3 );
-    AVSpin->setMinimum( -100.0 );
-    AVSpin->setMaximum( 100.0 );
+    AVSpin->setMinimum( -600.0 );
+    AVSpin->setMaximum( 600.0 );
     AVSpin->setSingleStep( 0.1 );
     AVSpin->setToolTip( qtr( "A positive value means that\n"
                              "the audio is ahead of the video" ) );
@@ -1333,8 +1331,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
     subsSpin = new QDoubleSpinBox;
     subsSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
     subsSpin->setDecimals( 3 );
-    subsSpin->setMinimum( -100.0 );
-    subsSpin->setMaximum( 100.0 );
+    subsSpin->setMinimum( -600.0 );
+    subsSpin->setMaximum( 600.0 );
     subsSpin->setSingleStep( 0.1 );
     subsSpin->setToolTip( qtr( "A positive value means that\n"
                              "the subtitles are ahead of the video" ) );