Added stub VideoWidget implementation

4 files changed, 202 insertions, 7 deletions

diff --git a/src/3rdparty/phonon/mmf/audiooutput.h b/src/3rdparty/phonon/mmf/audiooutput.h
index 016ec8e..ad39626 100644
--- a/src/3rdparty/phonon/mmf/audiooutput.h
+++ b/src/3rdparty/phonon/mmf/audiooutput.h
@@ -67,13 +67,10 @@ namespace Phonon
              */
             virtual bool setOutputDevice(const Phonon::AudioOutputDevice &);
 
-            void setVolumeControl(VolumeControlInterface *volumeControl);
-
             /**
-             * Called by MediaObject to pass initial volume when clip has been
-             * successfully opened
+             * Called by backend when nodes are connected.
              */
-            //void triggerVolumeChanged(qreal volume);
+            void setVolumeControl(VolumeControlInterface *volumeControl);
 
         Q_SIGNALS:
             void volumeChanged(qreal volume);
diff --git a/src/3rdparty/phonon/mmf/videoplayer.h b/src/3rdparty/phonon/mmf/videoplayer.h
index 9bf2622..b4cfa69 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.h
+++ b/src/3rdparty/phonon/mmf/videoplayer.h
@@ -37,10 +37,11 @@ namespace Phonon
          * <a href="http://wiki.forum.nokia.com/index.php/How_to_play_a_video_file_using_CVideoPlayerUtility">How to
          * play a video file using CVideoPlayerUtility</a>
          */
-        class VideoPlayer	:	public AbstractMediaPlayer
-							,	public MVideoPlayerUtilityObserver
+        class VideoPlayer		:	public AbstractMediaPlayer
+								,	public MVideoPlayerUtilityObserver
         {
             Q_OBJECT
+            
         public:
             VideoPlayer();
             explicit VideoPlayer(const AbstractPlayer& player);
diff --git a/src/3rdparty/phonon/mmf/videowidget.cpp b/src/3rdparty/phonon/mmf/videowidget.cpp
new file mode 100644
index 0000000..3628470
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/videowidget.cpp
@@ -0,0 +1,130 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "videowidget.h"
+
+
+using namespace Phonon;
+using namespace Phonon::MMF;
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+static const Phonon::VideoWidget::AspectRatio DefaultAspectRatio = 
+										Phonon::VideoWidget::AspectRatioAuto;
+static const qreal DefaultBrightness = 1.0;
+static const Phonon::VideoWidget::ScaleMode DefaultScaleMode = 
+										Phonon::VideoWidget::FitInView;
+static const qreal DefaultContrast = 1.0;
+static const qreal DefaultHue = 1.0;
+static const qreal DefaultSaturation = 1.0;
+
+
+//-----------------------------------------------------------------------------
+// Constructor / destructor
+//-----------------------------------------------------------------------------
+
+MMF::VideoWidget::VideoWidget()
+					:	m_aspectRatio(DefaultAspectRatio)
+					,	m_brightness(DefaultBrightness)
+					,	m_scaleMode(DefaultScaleMode)
+					,	m_contrast(DefaultContrast)
+					,	m_hue(DefaultHue)
+					,	m_saturation(DefaultSaturation)
+{
+
+}
+
+MMF::VideoWidget::~VideoWidget()
+{
+
+}
+
+
+//-----------------------------------------------------------------------------
+// VideoWidgetInterface
+//-----------------------------------------------------------------------------
+
+Phonon::VideoWidget::AspectRatio MMF::VideoWidget::aspectRatio() const
+{
+	return m_aspectRatio;
+}
+
+void MMF::VideoWidget::setAspectRatio
+	(Phonon::VideoWidget::AspectRatio aspectRatio)
+{
+	m_aspectRatio = aspectRatio;
+}
+
+qreal MMF::VideoWidget::brightness() const
+{
+	return m_brightness;
+}
+
+void MMF::VideoWidget::setBrightness(qreal brightness)
+{
+	m_brightness = brightness;
+}
+
+Phonon::VideoWidget::ScaleMode MMF::VideoWidget::scaleMode() const
+{
+	return m_scaleMode;
+}
+
+void MMF::VideoWidget::setScaleMode(Phonon::VideoWidget::ScaleMode scaleMode)
+{
+	m_scaleMode = scaleMode;
+}
+
+qreal MMF::VideoWidget::contrast() const
+{
+	return m_contrast;
+}
+
+void MMF::VideoWidget::setContrast(qreal contrast)
+{
+	m_contrast = contrast;
+}
+
+qreal MMF::VideoWidget::hue() const
+{
+	return m_hue;
+}
+
+void MMF::VideoWidget::setHue(qreal hue)
+{
+	m_hue = hue;
+}
+
+qreal MMF::VideoWidget::saturation() const
+{
+	return m_saturation;
+}
+
+void MMF::VideoWidget::setSaturation(qreal saturation)
+{
+	m_saturation = saturation;
+}
+
+QWidget* MMF::VideoWidget::widget()
+{
+	return this;
+}
+
+
diff --git a/src/3rdparty/phonon/mmf/videowidget.h b/src/3rdparty/phonon/mmf/videowidget.h
new file mode 100644
index 0000000..1ed23e2
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/videowidget.h
@@ -0,0 +1,67 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PHONON_MMF_VIDEOWIDGET_H
+#define PHONON_MMF_VIDEOWIDGET_H
+
+#include <QtGui/QWidget>
+#include <phonon/videowidget.h>
+#include <phonon/videowidgetinterface.h>
+
+namespace Phonon
+{
+    namespace MMF
+    {
+        class VideoWidget		:	public QWidget
+								,	public Phonon::VideoWidgetInterface
+        {
+            Q_OBJECT
+            Q_INTERFACES(Phonon::VideoWidgetInterface)
+            
+        public:
+        	VideoWidget();      
+        	~VideoWidget();
+
+			// VideoWidgetInterface
+        	virtual Phonon::VideoWidget::AspectRatio aspectRatio() const;
+			virtual void setAspectRatio(Phonon::VideoWidget::AspectRatio aspectRatio);
+			virtual qreal brightness() const;
+			virtual void setBrightness(qreal brightness);
+			virtual Phonon::VideoWidget::ScaleMode scaleMode() const;
+			virtual void setScaleMode(Phonon::VideoWidget::ScaleMode scaleMode);
+			virtual qreal contrast() const;
+			virtual void setContrast(qreal constrast);
+			virtual qreal hue() const;
+			virtual void setHue(qreal hue);
+			virtual qreal saturation() const;
+			virtual void setSaturation(qreal saturation);
+			virtual QWidget *widget();
+			
+        private:
+        	Phonon::VideoWidget::AspectRatio		m_aspectRatio;
+        	qreal									m_brightness;
+        	Phonon::VideoWidget::ScaleMode			m_scaleMode;
+        	qreal									m_contrast;
+        	qreal									m_hue;
+        	qreal									m_saturation;
+        	
+        };
+    }
+}
+
+#endif