Ticket #3245: ChangeChannel_UpdateOSDInput.patch.txt

File ChangeChannel_UpdateOSDInput.patch.txt, 1.2 KB (added by jerry.tk+mythtv@…, 13 years ago)
Line 
1Index: libs/libmythtv/tv_play.cpp
2===================================================================
3--- libs/libmythtv/tv_play.cpp  (revision 13106)
4+++ libs/libmythtv/tv_play.cpp  (working copy)
5@@ -4162,6 +4162,8 @@
6         activenvp->ResetTeletext();
7     }
8 
9+    QString oldinputname = activerecorder->GetInput();
10+
11     activerecorder->ChangeChannel(direction);
12     ClearInputQueues(false);
13 
14@@ -4169,6 +4171,10 @@
15         muteTimer->start(kMuteTimeout * 2, true);
16 
17     UnpauseLiveTV();
18+
19+    // If activenvp is main nvp, show new input in on screen display
20+    if (nvp && activenvp == nvp && oldinputname != activerecorder->GetInput())
21+        UpdateOSDInput();
22 }
23 
24 QString TV::GetQueuedInput(void) const
25@@ -4495,12 +4501,18 @@
26         activenvp->ResetTeletext();
27     }
28 
29+    QString oldinputname = activerecorder->GetInput();
30+
31     activerecorder->SetChannel(channum);
32 
33     if (muted)
34         muteTimer->start(kMuteTimeout * 2, true);
35 
36     UnpauseLiveTV();
37+
38+    // If activenvp is main nvp, show new input in on screen display
39+    if (nvp && activenvp == nvp && oldinputname != activerecorder->GetInput())
40+        UpdateOSDInput();   
41 }
42 
43 void TV::AddPreviousChannel(void)