Commit a checkpoint on the conversion of Lumina to Qt5.

It is functional at the moment, but still has a few rough edges with regards to the X11 background interface (due to the move from XLib to XCB in Qt5). This reulst in some of the window manager interactions not behaving properly (such as sticky status on panels).

1 files changed, 14 insertions, 12 deletions

diff --git a/lumina-fm/MainUI.h b/lumina-fm/MainUI.h
index 87a52668..1cc26830 100644
--- a/lumina-fm/MainUI.h
+++ b/lumina-fm/MainUI.h
@@ -40,13 +40,9 @@
 #include <QUrl>
 #include <QThread>
 
-//Phonon widgets
-//#include <Phonon/BackendCapabilities>
-#include <Phonon/MediaObject>
-#include <Phonon/VideoWidget>
-#include <Phonon/AudioOutput>
-#include <Phonon/SeekSlider>
-#include <Phonon/MediaSource>
+//Multimedia Widgets
+#include <QVideoWidget>
+#include <QMediaPlayer>
 
 // libLumina includes
 #include <LuminaXDG.h>
@@ -89,10 +85,10 @@ private:
 	QString favdir;
 
 	//Phonon Widgets for the multimedia player
-	Phonon::MediaObject *mediaObj;
-	Phonon::VideoWidget *videoDisplay;
-	Phonon::AudioOutput *audioOut;
-	Phonon::SeekSlider *playerSlider;
+	QMediaPlayer *mediaObj;
+	QVideoWidget *videoDisplay;
+	//Phonon::AudioOutput *audioOut;
+	QSlider *playerSlider;
 	QString playerTTime; //total time - to prevent recalculation every tick
 
 	//Internal variables
@@ -184,14 +180,20 @@ private slots:
 	
 	//Multimedia Player Functions
 	void playerStart();
+	void playerError();
 	void playerStop();
 	void playerPause();
 	void playerNext();
 	void playerPrevious();
 	void playerFinished(); //automatically called by the media object
-	void playerStateChanged(Phonon::State newstate, Phonon::State oldstate); //automatically called by the media object
+	void playerStatusChanged(QMediaPlayer::MediaStatus stat); //automatically called
+	void playerStateChanged(QMediaPlayer::State newstate); //automatically called by the media object
 	void playerVideoAvailable(bool showVideo); //automatically called by the media object
+	void playerDurationChanged(qint64);
 	void playerTimeChanged(qint64 ctime); //automatically called by the media object
+	void playerSliderMoved(int);
+	void playerSliderHeld();
+	void playerSliderChanged();
 	void playerFileChanged();
 	
 	//Context Menu Actions