Ticket #9819: mythtv-9819-PauseAllPlugins_on_playback_start_and_resume_on_end.patch

libs/libmythbase/mythcorecontext.cpp

@@ -1112 +1112 @@
     MythObservable::dispatch(event);
 }
 
-void MythCoreContext::dispatchNow(const MythEvent &event)
-{
-    LOG(VB_NETWORK, LOG_INFO, QString("MythEvent: %1").arg(event.Message()));
-
-    MythObservable::dispatchNow(event);
-}
-
 void MythCoreContext::SetLocalHostname(const QString &hostname)
 {
     QMutexLocker locker(&d->m_hostnameLock);

libs/libmythbase/mythcorecontext.h

@@ -151 +151 @@
     void OverrideSettingForSession(const QString &key, const QString &value);
 
     void dispatch(const MythEvent &event);
-    void dispatchNow(const MythEvent &event) MDEPRECATED;
 
     void InitLocale(void);
     const MythLocale *GetLocale(void) const;

libs/libmythbase/mythobservable.cpp

@@ -12 +12 @@
  *  events to listening QObjects.
  *
  *  MythEvents can be dispatched to all listeners by calling dispatch
- *  or dispatchNow. The former is much preferred as it uses
- *  QCoreApplication::postEvent() while the latter uses the blocking
- *  QCoreApplication::sendEvent().
+ *  which uses QCoreApplication::postEvent()
  *
  *  The name MythObservable is 'wrong', since all the methods refer to
  *  the observers as listeners (ie. addListener), however,
@@ -85 +83 @@
     for (; it != m_listeners.end() ; ++it)
         QCoreApplication::postEvent(*it, event.clone());
 }
-
-/** \brief Dispatch an event to all listeners
- *
- *  This sends an event using the current thread, this is
- *  almost always unsafe.
- *
- *  \param event a MythEvent to dispatch.
- */
-void MythObservable::dispatchNow(const MythEvent &event)
-{
-    QMutexLocker locker(m_lock);
-
-    QSet<QObject*>::const_iterator it = m_listeners.begin();
-    for (; it != m_listeners.end() ; ++it)
-        QCoreApplication::sendEvent(*it, event.clone());
-}
-

libs/libmythbase/mythobservable.h

@@ -18 +18 @@
     void removeListener(QObject *listener);
 
     void dispatch(const MythEvent &event);
-    void dispatchNow(const MythEvent &event) MDEPRECATED;
 
     bool hasListeners(void) { return !m_listeners.isEmpty(); }
 

libs/libmythbase/util.cpp

@@ -43 +43 @@
 
 // Myth headers
 #include "mythcorecontext.h"
+#include "mythcontext.h"
+#include "mythplugin.h"
 #include "exitcodes.h"
 #include "mythlogging.h"
 #include "msocketdevice.h"
@@ -1118 +1120 @@
 
 void sendPlaybackStart(void)
 {
-    MythEvent me(QString("PLAYBACK_START %1").arg(gCoreContext->GetHostName()));
-    gCoreContext->dispatchNow(me);
+    gContext->getPluginManager()->PauseAllPlugins();
 }
 
 void sendPlaybackEnd(void)
 {
-    MythEvent me(QString("PLAYBACK_END %1").arg(gCoreContext->GetHostName()));
-    gCoreContext->dispatchNow(me);
+    gContext->getPluginManager()->ResumeAllPlugins();
 }
 
 bool IsMACAddress(QString MAC)

libs/libmyth/mythpluginapi.h

@@ -7 +7 @@
 extern "C" {
     MPUBLIC int mythplugin_init(const char *);
     MPUBLIC int mythplugin_run();
+    MPUBLIC void mythplugin_pause();
+    MPUBLIC void mythplugin_resume();
     MPUBLIC int mythplugin_config();
     MPUBLIC MythPluginType mythplugin_type();
     MPUBLIC void mythplugin_destroy();

libs/libmyth/mythplugin.cpp

@@ -68 +68 @@
     return rVal;
 }
 
+void MythPlugin::pause(void)
+{
+    typedef int (*PluginPauseFunc)();
+    PluginPauseFunc rfunc = (PluginPauseFunc)QLibrary::resolve("mythplugin_pause");
+
+    if (rfunc)
+        rfunc();
+}
+
+void MythPlugin::resume(void)
+{
+    typedef int (*PluginResumeFunc)();
+    PluginResumeFunc rfunc = (PluginResumeFunc)QLibrary::resolve("mythplugin_resume");
+
+    if (rfunc)
+        rfunc();
+}
+
 int MythPlugin::config(void)
 {
     typedef int (*PluginConfigFunc)();
@@ -327 +345 @@
     return ret;
 }
 
+void MythPluginManager::PauseAllPlugins(void)
+{
+    QHash<QString, MythPlugin*>::iterator it = m_dict.begin();
+    for (; it != m_dict.end(); ++it)
+    {
+        (*it)->pause();
+    }
+}
+
+void MythPluginManager::ResumeAllPlugins(void)
+{
+    QHash<QString, MythPlugin*>::iterator it = m_dict.begin();
+    for (; it != m_dict.end(); ++it)
+    {
+        (*it)->resume();
+    }
+}

libs/libmyth/mythplugin.h

@@ -30 +30 @@
 
     // This method will call the mythplugin_run() function of the library.
     int run(void);
- 
+
+    // This method will call the mythplugin_pause() function of the library.
+    void pause(void);
+
+    // This method will call the mythplugin_resume() function of the library.
+    void resume(void);
+
     // This method will call the mythplugin_config() function of the library.
     int config(void);
 
@@ -67 +73 @@
 // this should only be instantiated through MythContext.
 class MPUBLIC MythPluginManager
 {
-  public:   
+  public:
     MythPluginManager();
    ~MythPluginManager();
-   
+
     bool init_plugin(const QString &plugname);
     bool run_plugin(const QString &plugname);
     bool config_plugin(const QString &plugname);
@@ -82 +88 @@
 
     QStringList EnumeratePlugins(void);
     void DestroyAllPlugins();
-     
+    void PauseAllPlugins();
+    void ResumeAllPlugins();
+
   private:
     QHash<QString,MythPlugin*> m_dict;
-   
+
     QMap<QString, MythPlugin *> moduleMap;
     QMap<QString, MythPlugin *> menuPluginMap;
     vector<MythPlugin*> menuPluginList;

libs/libmythbase/mythversion.h

@@ -12 +12 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20111201-1"
+#define MYTH_BINARY_VERSION "0.25.20111205-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *