Ticket #4376: ticket_4376_causing_embedded_playbackbox_to_hang.diff

libs/libmythtv/tv_play.h

@@ -215 +215 @@
     static void InitKeys(void);
     static bool StartTV(ProgramInfo *tvrec = NULL, bool startInGuide = false,
                         bool inPlaylist = false, bool initByNetworkCommand = false);
-    static void SetEmbedPbbFunc(RUNPLAYBACKBOX lptr);
+    static void SetFuncPtr(const char *, void *);
 
     void SetIgnoreKeys(bool ignore) { ignoreKeys = ignore; }
 
@@ -238 +238 @@
 
   protected:
     void doEditSchedule(int editType = kScheduleProgramGuide);
+    static void *RecordedShowMenuHandler(void *param);
+
     void RunTV(void);
     static void *EventThread(void *param);
     void SetMuteTimer(int timeout);

libs/libmythtv/tv_play.cpp

@@ -252 +252 @@
 
     return playCompleted;
 }
-       
-void TV::SetEmbedPbbFunc(RUNPLAYBACKBOX lptr)
+
+/**
+ * \brief Import pointers to functions used to embed the TV
+ * window into other containers e.g. playbackbox
+ */
+void TV::SetFuncPtr(const char *string, void *lptr)
 {
-    RunPlaybackBoxPtr = lptr;
+    QString name = QString(string);
+    if (name == "playbackbox")
+        RunPlaybackBoxPtr = (RUNPLAYBACKBOX)lptr;
 }
 
 void TV::InitKeys(void)
@@ -5669 +5675 @@
         nvp->DrawUnusedRects(sync);
 }
 
+void *TV::RecordedShowMenuHandler(void *param)
+{
+    TV *obj = (TV *)param;
+    obj->doEditSchedule(kPlaybackBox);
+
+    return NULL;
+}
+
 void TV::doEditSchedule(int editType)
 {
     if (!playbackinfo)
@@ -5827 +5841 @@
 
 void TV::EditSchedule(int editType)
 {
+    if (editType == kPlaybackBox && menurunning != true)
+    {
+        menurunning = true;
+        pthread_t tid;
+        pthread_attr_t attr;
+        pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+        pthread_create(&tid, &attr, TV::RecordedShowMenuHandler, this);
+        pthread_attr_destroy(&attr);
+
+        return;
+    }
+
     // post the request to the main UI thread
     // it will be caught in eventFilter and processed as CustomEvent
     // this will create the program guide window (widget)

programs/mythfrontend/main.cpp

@@ -801 +801 @@
 
     TV::InitKeys();
 
-    TV::SetEmbedPbbFunc(PlaybackBox::RunPlaybackBox);
+    TV::SetFuncPtr("playbackbox", (void *)PlaybackBox::RunPlaybackBox);
 }