removed unused class

src/gui/UBVideoPlayer.cpp

-/*
- * Copyright (C) 2013 Open Education Foundation
- *
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
- * l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of OpenBoard.
- *
- * OpenBoard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * OpenBoard is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-
-#include "UBVideoPlayer.h"
-
-#include <QtGui>
-
-#include <phonon/MediaObject>
-#include <phonon/SeekSlider>
-#include <phonon/VolumeSlider>
-
-#include "core/memcheck.h"
-
-UBVideoPlayer::UBVideoPlayer(QWidget* pParent)
-    : QWidget(pParent)
-    , mVideoPlayer(0)
-{
-    mVideoPlayer = new Phonon::VideoPlayer(Phonon::VideoCategory, this);
-    QVBoxLayout* mainLayout = new QVBoxLayout(this);
-    setLayout(mainLayout);
-
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->addWidget(mVideoPlayer);
-
-    QHBoxLayout* transportLayout = new QHBoxLayout(this);
-    mainLayout->addLayout(transportLayout);
-
-    mPlayPause = new QPushButton(this);
-    transportLayout->addWidget(mPlayPause);
-
-    Phonon::SeekSlider *slider = new Phonon::SeekSlider(this);
-    slider->setMediaObject(mVideoPlayer->mediaObject());
-    slider->setPageStep(100);
-    transportLayout->addWidget(slider);
-
-    connect(mPlayPause, SIGNAL(clicked()),
-            this, SLOT(tooglePlayPause()));
-
-    connect(mVideoPlayer->mediaObject(), SIGNAL(stateChanged ( Phonon::State, Phonon::State)),
-            this, SLOT(mediaStateChanged ( Phonon::State, Phonon::State)));
-
-}
-
-
-UBVideoPlayer::~UBVideoPlayer()
-{
-    // NOOP
-}
-
-
-void UBVideoPlayer::tooglePlayPause()
-{
-    if(mVideoPlayer->mediaObject()->state() == Phonon::PlayingState)
-    {
-        mVideoPlayer->mediaObject()->pause();
-    }
-    else
-    {
-         mVideoPlayer->mediaObject()->play();
-    }
-
-}
-
-
-void UBVideoPlayer::mediaStateChanged( Phonon::State newstate, Phonon::State oldstate )
-{
-    Q_UNUSED(oldstate);
-
-    if (newstate == Phonon::PlayingState)
-    {
-        mPlayPause->setIcon(QPixmap(":/images/pause.svg"));
-    }
-    else
-    {
-        mPlayPause->setIcon(QPixmap(":/images/play.svg"));
-    }
-}
-

src/gui/UBVideoPlayer.h

-/*
- * Copyright (C) 2013 Open Education Foundation
- *
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
- * l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of OpenBoard.
- *
- * OpenBoard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * OpenBoard is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-
-#ifndef UBVIDEOPLAYER_H_
-#define UBVIDEOPLAYER_H_
-
-
-#include <QtGui>
-#include <phonon/VideoPlayer>
-
-class UBVideoPlayerTransport;
-
-class UBVideoPlayer : public QWidget
-{
-    Q_OBJECT;
-
-    public:
-        UBVideoPlayer(QWidget* pParent = 0);
-        virtual ~UBVideoPlayer();
-
-        Phonon::VideoPlayer* videoPlayer()
-        {
-            return mVideoPlayer;
-        }
-
-        void loadMedia(QUrl url)
-        {
-            mVideoPlayer->load(Phonon::MediaSource(url));
-        }
-
-    protected:
-
-        Phonon::VideoPlayer* mVideoPlayer;
-        QPushButton *mPlayPause;
-
-    private slots:
-
-        void mediaStateChanged(Phonon::State newstate, Phonon::State oldstate);
-        void tooglePlayPause();
-
-};
-
-
-#endif /* UBVIDEOPLAYER_H_ */

src/gui/gui.pri

@@ -21,7 +21,6 @@ HEADERS += src/gui/UBThumbnailView.h \
     src/gui/UBRubberBand.h \
     src/gui/UBDocumentToolsPalette.h \
     src/gui/UBWebToolsPalette.h \
-    src/gui/UBVideoPlayer.h \
     src/gui/UBActionPalette.h \
     src/gui/UBFavoriteToolPalette.h \
     src/gui/UBKeyboardPalette.h \
@@ -65,7 +64,6 @@ SOURCES += src/gui/UBThumbnailView.cpp \
     src/gui/UBRubberBand.cpp \
     src/gui/UBDocumentToolsPalette.cpp \
     src/gui/UBWebToolsPalette.cpp \
-    src/gui/UBVideoPlayer.cpp \
     src/gui/UBActionPalette.cpp \
     src/gui/UBFavoriteToolPalette.cpp \
     src/gui/UBKeyboardPalette.cpp \

src/podcast/UBPodcastController.cpp

@@ -914,8 +914,6 @@ QList<QAction*> UBPodcastController::videoSizeActions()
 {
     if (mVideoSizesActions.length() == 0)
     {
-        QList<QAction*> videoSizeActions;
-
         mSmallVideoSizeAction = new QAction(tr("Small"), this);
         mMediumVideoSizeAction = new QAction(tr("Medium"), this);
         mFullVideoSizeAction = new QAction(tr("Full"), this);

src/podcast/youtube/UBYouTubePublisher.cpp

@@ -36,7 +36,6 @@
 #include "core/UBSetting.h"
 
 #include "gui/UBMainWindow.h"
-//#include "gui/UBVideoPlayer.h"
 
 #include "network/UBNetworkAccessManager.h"
 #include "network/UBServerXMLHttpRequest.h"