[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon=5D_/=3A_Merge_branch_=27zeitgeist=27?=
From:       Trever Fischer <wm161 () wm161 ! net>
Date:       2011-03-01 15:08:21
Message-ID: 20110301150821.A7ECFA60D1 () git ! kde ! org
[Download RAW message or body]

Git commit 94af71c5b5542766168594e432086b8cbbd77242 by Trever Fischer.
Committed on 01/03/2011 at 16:06.
Pushed by tdfischer into branch 'master'.

Merge branch 'zeitgeist'

Conflicts:
	demos/simpleplayer/player.cpp
	phonon/mediaobject.cpp

MM +13   -2    demos/simpleplayer/player.cpp     
MM +14   -0    phonon/CMakeLists.txt     
MM +202  -7    phonon/mediaobject.cpp     
MM +1    -0    phonon/mediaobject.h     
I  +21   -14   phonon/mediaobject_p.h     

http://commits.kde.org/phonon/94af71c5b5542766168594e432086b8cbbd77242

diff --cc demos/simpleplayer/player.cpp
index 46949f3,2bb7a09..c199145
--- a/demos/simpleplayer/player.cpp
+++ b/demos/simpleplayer/player.cpp
@@@ -36,8 -34,18 +36,19 @@@ Player::Player(QWidget* parent, Qt::Win
  {
      m_media = new Phonon::MediaObject(this);
  
-     Phonon::AudioOutput *audioOut = new Phonon::AudioOutput(Phonon::VideoCategory, \
                this);
-     Phonon::VideoWidget *videoOut = new Phonon::VideoWidget(this);
+     //Some platforms (i.e. Linux) provide a mechanism for a user to view a \
system-wide +     //history of content interactions. This is opt-in, and done via \
setting the +     //_p_LogPlayback property to true.
+     m_media->setProperty("_p_LogPlayback", true);
+ 
+     //There is also a _p_ForceLogPlayback property to eschew intelligent detection
+     //of whether or not to log playback events for cases otherwise ignored, such as
+     //output to a notification category.
+     //m_media->setProperty("_p_ForceLogPlayback", true);
+ 
+     Phonon::AudioOutput* audioOut = new Phonon::AudioOutput(Phonon::VideoCategory, \
this); +     Phonon::VideoWidget* videoOut = new Phonon::VideoWidget(this);
++
      videoOut->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
      //By default, there is no minimum size on a video widget. While the default
      //size is controlled by Qt's layouting system it makes sense to provide a
diff --cc phonon/CMakeLists.txt
index 2bbfeff,06d004a..e1344cb
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@@ -28,41 -28,49 +28,50 @@@ else(GLIB2_FOUND AND PULSEAUDIO_FOUND
     set(PULSEAUDIO_MAINLOOP_LIBRARY "")
  endif(GLIB2_FOUND AND PULSEAUDIO_FOUND)
  
+ macro_optional_find_package(QZeitgeist)
+ if (QZEITGEIST_INCLUDE_DIR)
+     set(QZEITGEIST_FOUND TRUE)
+ endif(QZEITGEIST_INCLUDE_DIR)
+ macro_log_feature(QZEITGEIST_FOUND "QtZeitgeist" "Qt bindings for Zeitgeist" \
"http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE) + if (QZEITGEIST_FOUND)
+     add_definitions(-DHAVE_QZEITGEIST)
+     include_directories(${QZEITGEIST_INCLUDE_DIR})
+ endif(QZEITGEIST_FOUND)
  
  set(phonon_LIB_SRCS
 -   objectdescription.cpp
 -   objectdescriptionmodel.cpp
 -   phononnamespace.cpp
 -   mediasource.cpp
 -   abstractmediastream.cpp
 -   streaminterface.cpp
 -   mediaobject.cpp
 -   medianode.cpp
 -   path.cpp
 -   effectparameter.cpp
 -   effect.cpp
 -   volumefadereffect.cpp
     abstractaudiooutput.cpp
     abstractaudiooutput_p.cpp
 -   audiooutput.cpp
 -   audiooutputinterface.cpp
 +   abstractmediastream.cpp
     abstractvideooutput.cpp
     abstractvideooutput_p.cpp
 +   audiodataoutput.cpp
 +   audiooutput.cpp
 +   audiooutputinterface.cpp
     backendcapabilities.cpp
 -   globalconfig.cpp
 +   effect.cpp
 +   effectparameter.cpp
 +   effectwidget.cpp
     factory.cpp
 -   platform.cpp
 +   globalconfig.cpp
 +   iodevicestream.cpp
     mediacontroller.cpp
 -   videowidget.cpp
 -   videoplayer.cpp
 +   mediaobject.cpp
 +   medianode.cpp
 +   mediasource.cpp
 +   mrl.cpp
 +   objectdescription.cpp
 +   objectdescriptionmodel.cpp
 +   path.cpp
 +   phononnamespace.cpp
 +   platform.cpp
 +   pulsesupport.cpp
     seekslider.cpp
 +   streaminterface.cpp
     swiftslider.cpp
 +   volumefadereffect.cpp
     volumeslider.cpp
 -   effectwidget.cpp
 -   iodevicestream.cpp
 -   audiodataoutput.cpp
 -   pulsesupport.cpp
 +   videoplayer.cpp
 +   videowidget.cpp
     )
  
  if (PULSEAUDIO_FOUND)
diff --cc phonon/mediaobject.h
index 6c6cb8b,78e4cce..e89e0be
--- a/phonon/mediaobject.h
+++ b/phonon/mediaobject.h
@@@ -602,11 -602,9 +602,12 @@@ namespace Phono
              Q_PRIVATE_SLOT(k_func(), void _k_resumePlay())
              Q_PRIVATE_SLOT(k_func(), void _k_resumePause())
              Q_PRIVATE_SLOT(k_func(), void _k_metaDataChanged(const \
QMultiMap<QString, QString> &))  +#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
 +            Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State, \
Phonon::State))  +#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
              Q_PRIVATE_SLOT(k_func(), void _k_aboutToFinish())
              Q_PRIVATE_SLOT(k_func(), void _k_currentSourceChanged(const MediaSource \
&)) +             Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State, \
Phonon::State))  };
  
      /**


[prev in list] [next in list] [prev in thread] [next in thread]