Some cleanup, start integrating audio visualizations

modules/gui/qt4/components/interface_widgets.cpp

@@ -150,12 +150,13 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
 {
     setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
     QHBoxLayout *layout = new QHBoxLayout( this );
+    layout->setMargin( 0 );
     QPushButton *prevButton = new QPushButton( "Prev" );
     QPushButton *nextButton = new QPushButton( "Next");
     layout->addWidget( prevButton );
     layout->addWidget( nextButton );
     setLayout( layout );
-    setMaximumHeight( 30 );
+    setMaximumHeight( 35 );
 }
 
 VisualSelector::~VisualSelector()

modules/gui/qt4/input_manager.hpp

@@ -35,6 +35,8 @@ public:
     virtual ~InputManager();
 
     void delInput();
+    bool hasAudio() { return b_has_audio; }
+    bool hasVideo() { return b_has_video; }
     bool b_has_audio, b_has_video, b_had_audio, b_had_video;
 private:
     intf_thread_t *p_intf;

modules/gui/qt4/main_interface.hpp

@@ -49,8 +49,6 @@ class MainInterface : public QVLCMW
 public:
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
-
-
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
@@ -80,6 +78,7 @@ private:
 
     bool                 playlistEmbeddedFlag;
     bool                 videoEmbeddedFlag;
+    bool                 alwaysVideoFlag;
 
     InputManager        *main_input_manager;
     InputSlider         *slider;
@@ -97,6 +96,7 @@ private slots:
     void prev();
     void next();
     void playlist();
+    void visual();
     void updateVolume( int sliderVolume );
 };
 
@@ -104,24 +104,21 @@ private slots:
 class VolumeClickHandler : public QObject
 {
 public:
-    VolumeClickHandler( MainInterface *_m ) :QObject(_m) {m = _m; }
+    VolumeClickHandler( intf_thread_t *_p_intf, MainInterface *_m ) :QObject(_m)
+    {m = _m; p_intf = _p_intf; }
     virtual ~VolumeClickHandler() {};
     bool eventFilter( QObject *obj, QEvent *e )
     {
         if (e->type() == QEvent::MouseButtonPress )
         {
-            if( obj->objectName() == "volLowLabel" )
-            {
-                m->ui.volumeSlider->setValue( 0 );
-            }
-            else
-                m->ui.volumeSlider->setValue( 100 );
+            aout_VolumeMute( p_intf, NULL );
             return true;
         }
         return false;
     }
 private:
     MainInterface *m;
+    intf_thread_t *p_intf;
 };
 
 #endif

modules/gui/qt4/ui/main_interface.ui

@@ -182,7 +182,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="volLowLabel" >
+      <widget class="QLabel" name="volMuteLabel" >
        <property name="text" >
         <string/>
        </property>
@@ -210,7 +210,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="volHighLabel" >
+      <widget class="QPushButton" name="visualButton" >
        <property name="text" >
         <string/>
        </property>
@@ -219,7 +219,7 @@
      <item>
       <widget class="QPushButton" name="playlistButton" >
        <property name="text" >
-        <string> </string>
+        <string/>
        </property>
       </widget>
      </item>