[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon/five] demos: Port the Phota demo application for Phonon5
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2014-07-10 8:16:40
Message-ID: E1X59Wy-0001A7-5S () scm ! kde ! org
[Download RAW message or body]

Git commit c83519985608f045f94ab685e1b86b1851c74090 by Casian Andrei.
Committed on 07/07/2014 at 06:55.
Pushed by casianandrei into branch 'five'.

Port the Phota demo application for Phonon5

M  +1    -1    demos/CMakeLists.txt
M  +3    -3    demos/phota/CMakeLists.txt
M  +2    -4    demos/phota/mainwindow.cpp
M  +9    -9    demos/phota/mediacontroller.cpp
M  +5    -5    demos/phota/mediacontroller.h

http://commits.kde.org/phonon/c83519985608f045f94ab685e1b86b1851c74090

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 05a98a2..d23c15f 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-#add_subdirectory(phota)
+add_subdirectory(phota)
 add_subdirectory(simpleplayer)
 #add_subdirectory(metadatareader)
 #add_subdirectory(simplecapture)
diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt
index 6911099..fb8b1a0 100644
--- a/demos/phota/CMakeLists.txt
+++ b/demos/phota/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6.9 FATAL_ERROR)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 
-find_package(Phonon REQUIRED)
+find_package(Phonon5 REQUIRED)
 
 add_definitions(${QT_DEFINITIONS} ${PHONON_DEFINITIONS})
 include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${PHONON_INCLUDES})
@@ -18,7 +18,7 @@ set(phota_SRCS
 
 qt5_wrap_ui(phota_SRCS videoeffects.ui)
 
-phonon_add_executable(phota ${phota_SRCS})
+add_executable(phota ${phota_SRCS})
 
 qt5_use_modules(phota Core Widgets)
-target_link_libraries(phota ${PHONON_LIBRARY})
+target_link_libraries(phota ${PHONON_LIBRARIES})
diff --git a/demos/phota/mainwindow.cpp b/demos/phota/mainwindow.cpp
index cd80ad9..77d0b1d 100644
--- a/demos/phota/mainwindow.cpp
+++ b/demos/phota/mainwindow.cpp
@@ -23,9 +23,8 @@
 #include "mediacontroller.h"
 #include "videoeffects.h"
 
-#include <phonon/MediaObject>
-#include <phonon/MediaSource>
-#include <phonon/VideoWidget>
+#include <phonon/player.h>
+#include <phonon/videowidget.h>
 
 #include <QContextMenuEvent>
 #include <QFileDialog>
@@ -37,7 +36,6 @@ MainWindow::MainWindow(QWidget *parent) :
     m_videoWidget = new Phonon::VideoWidget();
     setCentralWidget(m_videoWidget);
     m_mediaControl = new MediaController(this);
-    Phonon::createPath(m_mediaControl->mediaObject(), m_videoWidget);
     resize(600, 400);
 }
 
diff --git a/demos/phota/mediacontroller.cpp b/demos/phota/mediacontroller.cpp
index fb460db..5f1fee0 100644
--- a/demos/phota/mediacontroller.cpp
+++ b/demos/phota/mediacontroller.cpp
@@ -21,27 +21,27 @@
 
 #include "mediacontroller.h"
 
-#include <phonon/mediasource.h>
-#include <phonon/mediaobject.h>
+#include <phonon/player.h>
+#include <phonon/source.h>
 
 #include <QFileDialog>
 
 MediaController::MediaController(QObject *parent) :
     QObject(parent)
 {
-    m_media = new Phonon::MediaObject(this);
+    m_player = new Phonon::Player(this);
 }
 
-Phonon::MediaObject *MediaController::mediaObject() const
+Phonon::Player *MediaController::player() const
 {
-    return m_media;
+    return m_player;
 }
 
 void MediaController::openFile()
 {
     QString file = QFileDialog::getOpenFileName(0, tr("Open a new file to play"), "");
     if (!file.isEmpty()) {
-        Phonon::MediaSource s(file);
+        Phonon::Source s(file);
         playSource(s);
     }
 }
@@ -51,8 +51,8 @@ void MediaController::openURL()
 
 }
 
-void MediaController::playSource(const Phonon::MediaSource &s)
+void MediaController::playSource(const Phonon::Source &s)
 {
-    m_media->setCurrentSource(s);
-    m_media->play();
+    m_player->setSource(s);
+    m_player->play();
 }
diff --git a/demos/phota/mediacontroller.h b/demos/phota/mediacontroller.h
index c46eab4..8f953d8 100644
--- a/demos/phota/mediacontroller.h
+++ b/demos/phota/mediacontroller.h
@@ -26,8 +26,8 @@
 
 namespace Phonon
 {
-class MediaObject;
-class MediaSource;
+class Player;
+class Source;
 }
 
 class MediaController : public QObject
@@ -36,16 +36,16 @@ class MediaController : public QObject
 public:
     explicit MediaController(QObject *parent = 0);
     
-    Phonon::MediaObject *mediaObject() const;
+    Phonon::Player *player() const;
 
 public slots:
     void openFile();
     void openURL();
 
 private:
-    Phonon::MediaObject *m_media;
+    Phonon::Player *m_player;
 
-    void playSource(const Phonon::MediaSource &);
+    void playSource(const Phonon::Source &);
 };
 
 #endif // MEDIACONTROLLER_H

[prev in list] [next in list] [prev in thread] [next in thread]