Merge pull request nemomobile#8 from rburchell/master

Remove FeedbackPlayer
sledges · Jun 13, 2013 · 6460b94 · 6460b94
2 parents 6c31f15 + 367e6eb
commit 6460b94
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 280 deletions.
diff --git a/src/meego/feedbackplayer.cpp b/src/meego/feedbackplayer.cpp
diff --git a/src/meego/feedbackplayer.h b/src/meego/feedbackplayer.h
diff --git a/src/meego/mdeclarativestatusbar.cpp b/src/meego/mdeclarativestatusbar.cpp
@@ -53,7 +53,6 @@
 #include <qgraphicsscene.h>
 #include <qdebug.h>
 #include "mwindowstate.h"
-#include "feedbackplayer.h"
 
 #ifdef HAVE_DBUS
    #include <QDBusMessage>
@@ -128,8 +127,7 @@ MDeclarativeStatusBar::MDeclarativeStatusBar(QDeclarativeItem *parent) :
     mousePressed(false),
     feedbackDelay(false),
     swipeGesture(false),
-    mOrientation(MDeclarativeScreen::Portrait), 
-    feedbackPlayer(new FeedbackPlayer(this))
+    mOrientation(MDeclarativeScreen::Portrait)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
     setAcceptedMouseButtons(Qt::LeftButton);
@@ -162,11 +160,6 @@ MDeclarativeStatusBar::MDeclarativeStatusBar(QDeclarativeItem *parent) :
     MWindowState * windowState = MWindowState::instance();
     connect(windowState, SIGNAL(activeChanged()), this, SLOT(updateXdamageEventSubscription()));
     connect(this, SIGNAL(visibleChanged()), this, SLOT(updateXdamageEventSubscription()));
-
-    if (!feedbackPlayer->init("qt-components")) {
-        delete feedbackPlayer;
-        feedbackPlayer = 0;
-    }
 }
 
 MDeclarativeStatusBar::~MDeclarativeStatusBar()
@@ -175,7 +168,6 @@ MDeclarativeStatusBar::~MDeclarativeStatusBar()
     disconnect(windowState, SIGNAL(activeChanged()), this, SLOT(updateXdamageEventSubscription()));
 
     destroyXDamageForSharedPixmap();
-    delete feedbackPlayer;
 }
 
 void MDeclarativeStatusBar::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
@@ -335,9 +327,6 @@ void MDeclarativeStatusBar::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     firstPos = event->pos();
 
-    if (feedbackPlayer)
-        feedbackPlayer->sendPlaybackRequest(FeedbackPlayer::Press);
-
     if (!mousePressed) {
         mousePressed = true;
         update();
@@ -361,9 +350,6 @@ void MDeclarativeStatusBar::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         return;
     }
 
-    if (feedbackPlayer)
-        feedbackPlayer->sendPlaybackRequest(FeedbackPlayer::Release);
-
     mousePressed = false;
     update();
 

diff --git a/src/meego/mdeclarativestatusbar.h b/src/meego/mdeclarativestatusbar.h
@@ -45,15 +45,11 @@
 #include <mdeclarativescreen.h>
 #include <qglobal.h>
 
-#include "feedbackplayer.h"
-
-
 class QPixmap;
 class QDBusServiceWatcher;
 class QDBusPendingCallWatcher;
 class QGraphicsSceneMouseEvent;
 class QStyleOptionGraphicsItem;
-class FeedbackPlayer;
 
 class MDeclarativeStatusBar : public QDeclarativeItem
 {
@@ -108,8 +104,6 @@ public Q_SLOTS:
 
     MDeclarativeScreen::Orientation mOrientation;
 
-    FeedbackPlayer *feedbackPlayer;
-
 Q_SIGNALS:
     void orientationChanged();
     void hasPixmapChanged();

diff --git a/src/meego/meego.pro b/src/meego/meego.pro
@@ -102,8 +102,7 @@ SOURCES += \
     shadereffectitem/shadereffectitem.cpp \
     shadereffectitem/shadereffectsource.cpp \
     shadereffectitem/shadereffectbuffer.cpp \
-    shadereffectitem/scenegraph/qsggeometry.cpp \
-    feedbackplayer.cpp
+    shadereffectitem/scenegraph/qsggeometry.cpp
 
 HEADERS += \
     mdeclarativestatusbar.h \
@@ -136,8 +135,7 @@ HEADERS += \
     shadereffectitem/shadereffectitem.h \
     shadereffectitem/shadereffectsource.h \
     shadereffectitem/shadereffectbuffer.h \
-    shadereffectitem/scenegraph/qsggeometry.h \
-    feedbackplayer.h
+    shadereffectitem/scenegraph/qsggeometry.h
 
 
 QML_FILES = \