Qt4 - Media Info: cleanup, and move public => private.

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 529610e48ee33bdd062dd8017b8b3da4e3a150fa..c6bc6b662a124056a109fdbebb0bd4b92592c164 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -45,7 +45,7 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf, bool _mainInput,
 {
     i_runs = 0;
     p_input = NULL;
-    need_update = true;
+    b_need_update = true;
 
     setWindowTitle( qtr( "Media information" ) );
     resize( 600 , 300 );
@@ -113,8 +113,6 @@ void MediaInfoDialog::showTab( int i_tab = 0 )
     IT->setCurrentIndex( i_tab );
 }
 
-
-/**/
 void MediaInfoDialog::editMeta()
 {
     saveMetaButton->show();
@@ -130,7 +128,7 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
         vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     MediaInfoDialog *p_d = (MediaInfoDialog *)param;
-    p_d->need_update = VLC_TRUE;
+    p_d->b_need_update = VLC_TRUE;
     return VLC_SUCCESS;
 }
 
@@ -166,8 +164,8 @@ void MediaInfoDialog::update()
 
     vlc_object_yield( p_input );
 
-    update( input_GetItem(p_input), need_update, need_update );
-    need_update = false;
+    update( input_GetItem(p_input), b_need_update, b_need_update );
+    b_need_update = false;
 
     vlc_object_release( p_input );
 }

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index ec82d331ebcb5555aa113bec0b263f52d60351ce..8676af0aa9618faa1a08efb7c5b7ddf02af03aa3 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -36,12 +36,10 @@ class MediaInfoDialog : public QVLCFrame
 {
     Q_OBJECT;
 public:
-    MediaInfoDialog( intf_thread_t *, bool stats = true,
-                    bool mainInput = false );
+    MediaInfoDialog( intf_thread_t *, bool stats = true, bool mainInput = false );
     static MediaInfoDialog * getInstance( intf_thread_t *p_intf )
     {
-        if( !instance)
-            instance = new MediaInfoDialog( p_intf, true, true );
+        if( !instance) instance = new MediaInfoDialog( p_intf, true, true );
         return instance;
     }
     static void killInstance()
@@ -51,30 +49,39 @@ public:
     }
     virtual ~MediaInfoDialog();
 
-    void showTab( int );
-    bool need_update;
+    void showTab( int );    
     void setInput( input_item_t * );
-    QLineEdit *uriLine;
+    
+    bool b_need_update;
+    
 private:
     input_thread_t *p_input;
-    QTabWidget *IT;
     static MediaInfoDialog *instance;
+
     int i_runs;
     bool mainInput;
     bool stats;
+    
+
+    QTabWidget *IT;
     InputStatsPanel *ISP;
     MetaPanel *MP;
     InfoPanel *IP;
     ExtraMetaPanel *EMP;
+
     QPushButton *saveMetaButton;
+    QLineEdit *uriLine;
+
 public slots:
     void update();
     void saveMeta();
     void editMeta();
     void update( input_item_t *, bool, bool );
+    void updateButtons( int i_tab );
+
+private slots:
     void close();
     void clear();
-    void updateButtons( int i_tab );
 };
 
 #endif