Upload 1.9-1 to unstable

[minitube] / src / MediaView.h

diff --git a/src/MediaView.h b/src/MediaView.h
index acfa6a6189f557b619040e5d8b7330673bb91370..9d30c5017dc7c3a7d5287e510f5de34bfcfba059 100644 (file)
--- a/src/MediaView.h
+++ b/src/MediaView.h
@@ -5,15 +5,17 @@
 #include <QtNetwork>
 #include <phonon/mediaobject.h>
 #include <phonon/videowidget.h>
+#include <phonon/seekslider.h>
 #include "View.h"
 #include "ListModel.h"
-#include "thlibrary/thblackbar.h"
+#include "segmentedcontrol.h"
 #include "searchparams.h"
-#include "playlistwidget.h"
 #include "loadingwidget.h"
 #include "videoareawidget.h"
 
 class DownloadItem;
+class PlaylistView;
+class SidebarWidget;
 
 namespace The {
     QMap<QString, QAction*>* globalActions();
@@ -27,9 +29,7 @@ public:
     void initialize();
 
     // View
-    void appear() {
-        listView->setFocus();
-    }
+    void appear();
     void disappear();
     QMap<QString, QVariant> metadata() {
         QMap<QString, QVariant> metadata;
@@ -41,26 +41,30 @@ public:
     }
 
     void setMediaObject(Phonon::MediaObject *mediaObject);
-    void setSlider(QSlider *slider);
+    void setSlider(Phonon::SeekSlider *slider) { this->seekSlider = slider; }
 
 public slots:
     void search(SearchParams *searchParams);
     void pause();
     void stop();
     void skip();
+    void skipBackward();
     void skipVideo();
     void openWebPage();
     void copyWebPage();
     void copyVideoLink();
     void shareViaTwitter();
     void shareViaFacebook();
+    void shareViaBuffer();
     void shareViaEmail();
     void removeSelected();
     void moveUpSelected();
     void moveDownSelected();
+    bool isPlaylistVisible();
     void setPlaylistVisible(bool visible=true);
     void saveSplitterState();
     void downloadVideo();
+    void snapshot();
     void fullscreen();
     void findVideoParts();
 
@@ -76,6 +80,7 @@ private slots:
     void stateChanged(Phonon::State newState, Phonon::State oldState);
     void currentSourceChanged(const Phonon::MediaSource source);
     void showVideoContextMenu(QPoint point);
+    void aboutToFinish();
     // bar
     void searchMostRelevant();
     void searchMostRecent();
@@ -90,6 +95,8 @@ private slots:
     void downloadStatusChanged();
     void playbackFinished();
     void playbackResume();
+    void authorPushed(QModelIndex);
+    void searchAgain();
 
     /*
     void downloadProgress(int percent);
@@ -104,12 +111,12 @@ private:
 
     QSplitter *splitter;
 
-    PlaylistWidget *playlistWidget;
-    QListView *listView;
+    SidebarWidget *sidebar;
+    PlaylistView *listView;
     ListModel *listModel;
 
     // sortBar
-    THBlackBar *sortBar;
+    SegmentedControl *sortBar;
     QAction *mostRelevantAction;
     QAction *mostRecentAction;
     QAction *mostViewedAction;
@@ -117,6 +124,7 @@ private:
     // phonon
     Phonon::MediaObject *mediaObject;
     Phonon::VideoWidget *videoWidget;
+    Phonon::SeekSlider *seekSlider;
 
     // loadingWidget
     VideoAreaWidget *videoAreaWidget;
@@ -134,7 +142,6 @@ private:
 #endif
 
     DownloadItem *downloadItem;
-    // QSlider *slider;
 
 };