1 | *** ../mythtv-0.20.2.orig/libs/libmythtv/tv_play.cpp 2006-09-30 10:17:20.000000000 -0700 |
---|
2 | --- ../mythtv-0.20.2/libs/libmythtv/tv_play.cpp 2008-01-05 18:10:23.273958904 -0800 |
---|
3 | *************** |
---|
4 | *** 98,104 **** |
---|
5 | REG_KEY("TV Playback", "CHANNELDOWN", "Channel down", "Down"); |
---|
6 | REG_KEY("TV Playback", "NEXTFAV", "Switch to the next favorite channel", |
---|
7 | "/"); |
---|
8 | - REG_KEY("TV Playback", "PREVCHAN", "Switch to the previous channel", "H"); |
---|
9 | REG_KEY("TV Playback", "JUMPFFWD", "Jump ahead", "PgDown"); |
---|
10 | REG_KEY("TV Playback", "JUMPRWND", "Jump back", "PgUp"); |
---|
11 | REG_KEY("TV Playback", "JUMPBKMRK", "Jump to bookmark", "K"); |
---|
12 | --- 98,103 ---- |
---|
13 | *************** |
---|
14 | *** 181,187 **** |
---|
15 | REG_KEY("TV Playback", "FINDER", "Show the Program Finder", "#"); |
---|
16 | REG_KEY("TV Playback", "TOGGLESLEEP", "Toggle the Sleep Timer", "F8"); |
---|
17 | REG_KEY("TV Playback", "PLAY", "Play", "Ctrl+P"); |
---|
18 | ! REG_KEY("TV Playback", "JUMPPREV", "Jump to previously played recording", ""); |
---|
19 | REG_KEY("TV Playback", "JUMPREC", "Display menu of recorded programs to jump to", ""); |
---|
20 | REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "F7"); |
---|
21 | REG_KEY("TV Playback", "JUMPTODVDROOTMENU", "Jump to the DVD Root Menu", ""); |
---|
22 | --- 180,186 ---- |
---|
23 | REG_KEY("TV Playback", "FINDER", "Show the Program Finder", "#"); |
---|
24 | REG_KEY("TV Playback", "TOGGLESLEEP", "Toggle the Sleep Timer", "F8"); |
---|
25 | REG_KEY("TV Playback", "PLAY", "Play", "Ctrl+P"); |
---|
26 | ! REG_KEY("TV Playback", "JUMPPREV", "Jump to previous recording or channel", ""); |
---|
27 | REG_KEY("TV Playback", "JUMPREC", "Display menu of recorded programs to jump to", ""); |
---|
28 | REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "F7"); |
---|
29 | REG_KEY("TV Playback", "JUMPTODVDROOTMENU", "Jump to the DVD Root Menu", ""); |
---|
30 | *************** |
---|
31 | *** 2432,2441 **** |
---|
32 | --- 2431,2447 ---- |
---|
33 | } |
---|
34 | else if (action == "JUMPPREV") |
---|
35 | { |
---|
36 | + if (StateIsLiveTV(GetState())) |
---|
37 | + { |
---|
38 | + PreviousChannel(); |
---|
39 | + } |
---|
40 | + else if (lastProgram != NULL) |
---|
41 | + { |
---|
42 | nvp->SetBookmark(); |
---|
43 | exitPlayer = true; |
---|
44 | wantsToQuit = true; |
---|
45 | jumpToProgram = true; |
---|
46 | + } |
---|
47 | } |
---|
48 | else if (action == "JUMPREC") |
---|
49 | DisplayJumpMenuSoon(); |
---|
50 | *************** |
---|
51 | *** 2693,2699 **** |
---|
52 | SwapPIPSoon(); |
---|
53 | else if (action == "TOGGLEBROWSE") |
---|
54 | BrowseStart(); |
---|
55 | ! else if (action == "PREVCHAN") |
---|
56 | PreviousChannel(); |
---|
57 | else if (action == "CHANNELUP") |
---|
58 | { |
---|
59 | --- 2699,2705 ---- |
---|
60 | SwapPIPSoon(); |
---|
61 | else if (action == "TOGGLEBROWSE") |
---|
62 | BrowseStart(); |
---|
63 | ! else if (action == "JUMPPREV") |
---|
64 | PreviousChannel(); |
---|
65 | else if (action == "CHANNELUP") |
---|
66 | { |
---|
67 | *************** |
---|
68 | *** 6064,6070 **** |
---|
69 | SwapPIPSoon(); |
---|
70 | else if (action == "TOGGLEBROWSE") |
---|
71 | BrowseStart(); |
---|
72 | ! else if (action == "PREVCHAN") |
---|
73 | PreviousChannel(); |
---|
74 | else |
---|
75 | { |
---|
76 | --- 6070,6076 ---- |
---|
77 | SwapPIPSoon(); |
---|
78 | else if (action == "TOGGLEBROWSE") |
---|
79 | BrowseStart(); |
---|
80 | ! else if (action == "JUMPPREV") |
---|
81 | PreviousChannel(); |
---|
82 | else |
---|
83 | { |
---|
84 | *************** |
---|
85 | *** 6095,6104 **** |
---|
86 | --- 6101,6117 ---- |
---|
87 | DoQueueTranscode("Low Quality"); |
---|
88 | else if (action == "JUMPPREV") |
---|
89 | { |
---|
90 | + if (StateIsLiveTV(GetState())) |
---|
91 | + { |
---|
92 | + PreviousChannel(); |
---|
93 | + } |
---|
94 | + else if (lastProgram != NULL) |
---|
95 | + { |
---|
96 | nvp->SetBookmark(); |
---|
97 | exitPlayer = true; |
---|
98 | wantsToQuit = true; |
---|
99 | jumpToProgram = true; |
---|
100 | + } |
---|
101 | } |
---|
102 | else if (action == "JUMPREC") |
---|
103 | DisplayJumpMenuSoon(); |
---|
104 | *************** |
---|
105 | *** 6256,6262 **** |
---|
106 | "TOGGLEBROWSE"); |
---|
107 | |
---|
108 | item = new OSDGenericTree(treeMenu, tr("Previous Channel"), |
---|
109 | ! "PREVCHAN"); |
---|
110 | } |
---|
111 | else if (StateIsPlaying(internalState) && activerbuffer->isDVD()) |
---|
112 | { |
---|
113 | --- 6269,6275 ---- |
---|
114 | "TOGGLEBROWSE"); |
---|
115 | |
---|
116 | item = new OSDGenericTree(treeMenu, tr("Previous Channel"), |
---|
117 | ! "JUMPPREV"); |
---|
118 | } |
---|
119 | else if (StateIsPlaying(internalState) && activerbuffer->isDVD()) |
---|
120 | { |
---|