From f70d3fff64f4cd424efbf56225d86a4d3587eb02 Mon Sep 17 00:00:00 2001 From: -f Date: Tue, 21 Jan 2014 15:40:19 +0100 Subject: [PATCH] removed unused class --- src/gui/UBVideoPlayer.cpp | 102 --------------------- src/gui/UBVideoPlayer.h | 68 -------------- src/gui/gui.pri | 2 - src/podcast/UBPodcastController.cpp | 2 - src/podcast/youtube/UBYouTubePublisher.cpp | 1 - 5 files changed, 175 deletions(-) delete mode 100644 src/gui/UBVideoPlayer.cpp delete mode 100644 src/gui/UBVideoPlayer.h diff --git a/src/gui/UBVideoPlayer.cpp b/src/gui/UBVideoPlayer.cpp deleted file mode 100644 index b6e9d077..00000000 --- a/src/gui/UBVideoPlayer.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* - * 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 . - */ - - - - -#include "UBVideoPlayer.h" - -#include - -#include -#include -#include - -#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")); - } -} - diff --git a/src/gui/UBVideoPlayer.h b/src/gui/UBVideoPlayer.h deleted file mode 100644 index a21e9a19..00000000 --- a/src/gui/UBVideoPlayer.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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 . - */ - - - - -#ifndef UBVIDEOPLAYER_H_ -#define UBVIDEOPLAYER_H_ - - -#include -#include - -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_ */ diff --git a/src/gui/gui.pri b/src/gui/gui.pri index b8fd2b08..dd1fd260 100644 --- a/src/gui/gui.pri +++ b/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 \ diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 6165c6ce..0739499b 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -914,8 +914,6 @@ QList UBPodcastController::videoSizeActions() { if (mVideoSizesActions.length() == 0) { - QList videoSizeActions; - mSmallVideoSizeAction = new QAction(tr("Small"), this); mMediumVideoSizeAction = new QAction(tr("Medium"), this); mFullVideoSizeAction = new QAction(tr("Full"), this); diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp index 8fdc5e0a..b029daa7 100644 --- a/src/podcast/youtube/UBYouTubePublisher.cpp +++ b/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"