X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2FMediaView.h;h=8bf2c8d075dac249cacf71fe27126942fd0b277e;hb=c420dd995be8f80ae4ace7e4ffa86710b68ea5ff;hp=f61799a7806ac4072fd4dc95ecf827337e1fdb2a;hpb=e536746e91459fb3a7735f36caee77f299c765e2;p=minitube diff --git a/src/MediaView.h b/src/MediaView.h index f61799a..8bf2c8d 100644 --- a/src/MediaView.h +++ b/src/MediaView.h @@ -5,15 +5,17 @@ #include #include #include +#include #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; namespace The { QMap* globalActions(); @@ -27,9 +29,7 @@ public: void initialize(); // View - void appear() { - listView->setFocus(); - } + void appear(); void disappear(); QMap metadata() { QMap metadata; @@ -41,17 +41,21 @@ 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 shareViaEmail(); void removeSelected(); void moveUpSelected(); void moveDownSelected(); @@ -59,6 +63,7 @@ public slots: void saveSplitterState(); void downloadVideo(); void fullscreen(); + void findVideoParts(); private slots: // list/model @@ -72,6 +77,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(); @@ -80,9 +86,13 @@ private slots: void timerPlay(); #ifdef APP_DEMO void demoMessage(); + void updateContinueButton(int); #endif void startPlaying(); void downloadStatusChanged(); + void playbackFinished(); + void playbackResume(); + void authorPushed(QModelIndex); /* void downloadProgress(int percent); @@ -91,17 +101,18 @@ private slots: */ private: + static QRegExp wordRE(QString s); SearchParams *searchParams; QSplitter *splitter; PlaylistWidget *playlistWidget; - QListView *listView; + PlaylistView *listView; ListModel *listModel; // sortBar - THBlackBar *sortBar; + SegmentedControl *sortBar; QAction *mostRelevantAction; QAction *mostRecentAction; QAction *mostViewedAction; @@ -109,6 +120,7 @@ private: // phonon Phonon::MediaObject *mediaObject; Phonon::VideoWidget *videoWidget; + Phonon::SeekSlider *seekSlider; // loadingWidget VideoAreaWidget *videoAreaWidget; @@ -126,7 +138,6 @@ private: #endif DownloadItem *downloadItem; - // QSlider *slider; };