From a0707d50cd792a6fd75b28fd0dd80b9801fc0990 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Thu, 31 Jan 2013 09:53:51 +0100 Subject: [PATCH] Blackberry: Refactor plugin directory structure Move the mediaplayer related code in its own subdirectory. This is a preparation for adding camera support in the future. Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd Reviewed-by: Thomas McGuire --- .../{mediaservice => }/bbserviceplugin.cpp | 0 .../{mediaservice => }/bbserviceplugin.h | 0 src/plugins/blackberry/blackberry.pro | 16 +++++++++--- .../blackberry_mediaservice.json | 0 .../bbmediaplayercontrol.cpp | 0 .../bbmediaplayercontrol.h | 0 .../bbmediaplayerservice.cpp | 0 .../bbmediaplayerservice.h | 0 .../bbmetadata.cpp | 0 .../bbmetadata.h | 0 .../{mediaservice => mediaplayer}/bbutil.cpp | 0 .../{mediaservice => mediaplayer}/bbutil.h | 0 .../bbvideowindowcontrol.cpp | 0 .../bbvideowindowcontrol.h | 0 .../blackberry/mediaplayer/mediaplayer.pri | 17 ++++++++++++ .../blackberry/mediaservice/mediaservice.pro | 26 ------------------- 16 files changed, 30 insertions(+), 29 deletions(-) rename src/plugins/blackberry/{mediaservice => }/bbserviceplugin.cpp (100%) rename src/plugins/blackberry/{mediaservice => }/bbserviceplugin.h (100%) rename src/plugins/blackberry/{mediaservice => }/blackberry_mediaservice.json (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmediaplayercontrol.cpp (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmediaplayercontrol.h (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmediaplayerservice.cpp (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmediaplayerservice.h (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmetadata.cpp (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbmetadata.h (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbutil.cpp (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbutil.h (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbvideowindowcontrol.cpp (100%) rename src/plugins/blackberry/{mediaservice => mediaplayer}/bbvideowindowcontrol.h (100%) create mode 100644 src/plugins/blackberry/mediaplayer/mediaplayer.pri delete mode 100644 src/plugins/blackberry/mediaservice/mediaservice.pro diff --git a/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp b/src/plugins/blackberry/bbserviceplugin.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbserviceplugin.cpp rename to src/plugins/blackberry/bbserviceplugin.cpp diff --git a/src/plugins/blackberry/mediaservice/bbserviceplugin.h b/src/plugins/blackberry/bbserviceplugin.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbserviceplugin.h rename to src/plugins/blackberry/bbserviceplugin.h diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro index a0347652..ef414d7e 100644 --- a/src/plugins/blackberry/blackberry.pro +++ b/src/plugins/blackberry/blackberry.pro @@ -1,5 +1,15 @@ -TEMPLATE = subdirs +TARGET = qtmedia_blackberry +QT += multimedia-private gui-private -SUBDIRS += \ - mediaservice +PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = BbServicePlugin +load(qt_plugin) +LIBS += -lscreen + +HEADERS += bbserviceplugin.h +SOURCES += bbserviceplugin.cpp + +include(mediaplayer/mediaplayer.pri) + +OTHER_FILES += blackberry_mediaservice.json diff --git a/src/plugins/blackberry/mediaservice/blackberry_mediaservice.json b/src/plugins/blackberry/blackberry_mediaservice.json similarity index 100% rename from src/plugins/blackberry/mediaservice/blackberry_mediaservice.json rename to src/plugins/blackberry/blackberry_mediaservice.json diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp rename to src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.cpp diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h rename to src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.h diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp rename to src/plugins/blackberry/mediaplayer/bbmediaplayerservice.cpp diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmediaplayerservice.h rename to src/plugins/blackberry/mediaplayer/bbmediaplayerservice.h diff --git a/src/plugins/blackberry/mediaservice/bbmetadata.cpp b/src/plugins/blackberry/mediaplayer/bbmetadata.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmetadata.cpp rename to src/plugins/blackberry/mediaplayer/bbmetadata.cpp diff --git a/src/plugins/blackberry/mediaservice/bbmetadata.h b/src/plugins/blackberry/mediaplayer/bbmetadata.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbmetadata.h rename to src/plugins/blackberry/mediaplayer/bbmetadata.h diff --git a/src/plugins/blackberry/mediaservice/bbutil.cpp b/src/plugins/blackberry/mediaplayer/bbutil.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbutil.cpp rename to src/plugins/blackberry/mediaplayer/bbutil.cpp diff --git a/src/plugins/blackberry/mediaservice/bbutil.h b/src/plugins/blackberry/mediaplayer/bbutil.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbutil.h rename to src/plugins/blackberry/mediaplayer/bbutil.h diff --git a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.cpp similarity index 100% rename from src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp rename to src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.cpp diff --git a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.h similarity index 100% rename from src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h rename to src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.h diff --git a/src/plugins/blackberry/mediaplayer/mediaplayer.pri b/src/plugins/blackberry/mediaplayer/mediaplayer.pri new file mode 100644 index 00000000..cf888f65 --- /dev/null +++ b/src/plugins/blackberry/mediaplayer/mediaplayer.pri @@ -0,0 +1,17 @@ +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/bbmediaplayercontrol.h \ + $$PWD/bbmediaplayerservice.h \ + $$PWD/bbmetadata.h \ + $$PWD/bbutil.h \ + $$PWD/bbvideowindowcontrol.h + +SOURCES += \ + $$PWD/bbmediaplayercontrol.cpp \ + $$PWD/bbmediaplayerservice.cpp \ + $$PWD/bbmetadata.cpp \ + $$PWD/bbutil.cpp \ + $$PWD/bbvideowindowcontrol.cpp + +LIBS += -lmmrndclient -lstrm diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro deleted file mode 100644 index ffaed481..00000000 --- a/src/plugins/blackberry/mediaservice/mediaservice.pro +++ /dev/null @@ -1,26 +0,0 @@ -TARGET = qtmedia_blackberry -QT += multimedia-private gui-private - -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = BbServicePlugin -load(qt_plugin) - -LIBS += -lmmrndclient -lstrm -lscreen - -HEADERS += \ - bbserviceplugin.h \ - bbmediaplayerservice.h \ - bbmediaplayercontrol.h \ - bbmetadata.h \ - bbutil.h \ - bbvideowindowcontrol.h - -SOURCES += \ - bbserviceplugin.cpp \ - bbmediaplayerservice.cpp \ - bbmediaplayercontrol.cpp \ - bbmetadata.cpp \ - bbutil.cpp \ - bbvideowindowcontrol.cpp - -OTHER_FILES += blackberry_mediaservice.json