Ticket #4629: patch-addsubtitle.2.cpp

File patch-addsubtitle.2.cpp, 1.4 KB (added by Yeechang Lee <ylee@…>, 16 years ago)

Patch updated against r16237

Line 
1Index: libs/libmythtv/tv_play.cpp
2===================================================================
3--- libs/libmythtv/tv_play.cpp  (revision 16237)
4+++ libs/libmythtv/tv_play.cpp  (working copy)
5@@ -7629,7 +7629,12 @@
6         item = new OSDGenericTree(treeMenu, tr("Jump to Program"));
7         subitem = new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
8         if (lastProgram != NULL)
9-            subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
10+            {
11+                if (lastProgram->subtitle != "")
12+                    subitem = new OSDGenericTree(item, QString("%1: %2").arg(lastProgram->title).arg(lastProgram->subtitle), "JUMPPREV");
13+                else
14+                    subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
15+            }
16     }
17 
18     if (freeRecorders)
19@@ -7747,7 +7752,12 @@
20 
21     subitem = new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
22     if (lastProgram != NULL)
23-        subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
24+        {
25+            if (lastProgram->subtitle != "")
26+                subitem = new OSDGenericTree(item, QString("%1: %2").arg(lastProgram->title).arg(lastProgram->subtitle), "JUMPPREV");
27+            else
28+                subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
29+        }
30 
31     pbinfoLock.lock();
32