Changeset 30921
- Timestamp:
- 11/10/14 13:09:04 (9 years ago)
- Location:
- titan/titan
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/infobar.h
r30920 r30921 5 5 { 6 6 int rcret = 0, ret = 0, infobartimeout = 0, rcwait = 1000, count = 0, first = 1; 7 int playpic = 0;8 7 struct channel* pipchannel = NULL; 9 8 struct skin* playinfobarpic = getscreen("playinfobarpic"); … … 32 31 int playinfobarcount = 0, playinfobarstatus = 0; 33 32 34 if(checkbox("ATEMIO-NEMESIS") == 1 || checkbox("ATEMIO5200") == 1 || checkbox("ATEMIO6000") == 1 || checkbox("ATEMIO6100") == 1 || checkbox("ATEMIO6200") == 1 || ( checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && ostrcmp(getconfig("remotecontrol", NULL), "1") != 1)33 if(checkbox("ATEMIO-NEMESIS") == 1 || checkbox("ATEMIO5200") == 1 || checkbox("ATEMIO6000") == 1 || checkbox("ATEMIO6100") == 1 || checkbox("ATEMIO6200") == 1 || ((checkbox("ATEMIO520") == 1 || checkbox("ATEMIO530") == 1) && ostrcmp(getconfig("remotecontrol", NULL), "1") != 1)) 35 34 playstop = 0; 36 35 else … … 72 71 if(rcret == RCTIMEOUT) 73 72 { 74 if( playpic == 1) {73 if(status.playpic == 1) { 75 74 //it anymore needed 76 75 // if (checkbox("ATEMIO-NEMESIS") != 1) … … 152 151 { 153 152 //timeshift 154 if(playpic == 1) { 153 if(status.playpic == 1) 154 { 155 155 clearscreen(playinfobarpic); 156 playpic = 0;156 status.playpic = 0; 157 157 } 158 158 if(status.timeshift == 1 && (status.playing == 0 || status.slowspeed != 0 || status.playspeed != 0 || status.pause != 0)) … … 162 162 timeshiftpause(0); 163 163 timeshiftinfobar(&playinfobarstatus, &playinfobarcount); 164 if(status.playpic == 0) 165 { 166 drawscreen(playinfobarpic, 0, 0); 167 status.playpic = 1; 168 } 164 169 } 165 170 else … … 169 174 { 170 175 if(status.timeshift == 1) 171 playpic = 2;176 status.playpic = 2; 172 177 else 173 playpic = 0; 178 status.playpic = 0; 179 174 180 timeshiftpause(0); 175 181 timeshiftinfobar(&playinfobarstatus, &playinfobarcount); 176 if(playpic == 0) { 182 if(status.playpic == 0) 183 { 177 184 drawscreen(playinfobarpic, 0, 0); 178 playpic = 1;179 } 180 } 181 185 status.playpic = 1; 186 } 187 } 188 182 189 continue; 183 190 } … … 186 193 if(rcret == getrcconfigint("rcstop", NULL)) 187 194 { 188 if(playpic == 1) { 195 if(status.playpic == 1) 196 { 189 197 clearscreen(playinfobarpic); 190 playpic = 0;198 status.playpic = 0; 191 199 } 192 200 timeshiftstop(0); … … 195 203 if(rcret == getrcconfigint("rcplay", NULL)) 196 204 { 197 if(playpic == 1) { 205 if(status.playpic == 1) 206 { 198 207 clearscreen(playinfobarpic); 199 playpic = 0;208 status.playpic = 0; 200 209 } 201 210 if(playstop == 1 && status.timeshifttype == 1) … … 313 322 { 314 323 playrcjumpf(status.playfile, NULL, 300, &playinfobarstatus, &playinfobarcount, 1, 4); 324 #ifdef MIPSEL 325 // workaround fixes image flicker when jumping over the border also 326 playrcjumpr(status.playfile, NULL, 10, &playinfobarstatus, &playinfobarcount, 1, 4); 327 #endif 315 328 continue; 316 329 } … … 323 336 { 324 337 playrcjumpf(status.playfile, NULL, 60, &playinfobarstatus, &playinfobarcount, 1, 4); 338 #ifdef MIPSEL 339 // workaround fixes image flicker when jumping over the border also 340 playrcjumpr(status.playfile, NULL, 10, &playinfobarstatus, &playinfobarcount, 1, 4); 341 #endif 325 342 continue; 326 343 } … … 699 716 drawscreen(skin, 0, 0); 700 717 subtitlepause(0); 718 resettvpic(); 701 719 continue; 702 720 } … … 725 743 status.infobaraktiv = 1; 726 744 subtitlepause(0); 745 resettvpic(); 727 746 continue; 728 747 } -
titan/titan/struct.h
r30772 r30921 1303 1303 int slowspeed; 1304 1304 int prefillbuffer; 1305 int playpic; 1305 1306 #ifdef EPLAYER4 1306 1307 int bufferpercent; -
titan/titan/timeshift.h
r24911 r30921 148 148 149 149 struct service* snode = getservice(RECORDTIMESHIFT, 0); 150 150 struct skin* playinfobarpic = getscreen("playinfobarpic"); 151 151 152 if((status.timeshifttype == 0 && status.playing == 0) || (status.timeshifttype == 1 && status.playing == 0 && status.timeshiftpos > 0)) 152 153 { … … 154 155 { 155 156 textbox(_("Message"), _("Timeshift file to short\nplease wait a little and try again"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0); 157 if(status.playpic == 0) 158 { 159 drawscreen(playinfobarpic, 0, 0); 160 status.playpic = 1; 161 } 156 162 return; 157 163 } … … 161 167 { 162 168 textbox(_("Message"), _("Can't start timeshift play !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0); 169 if(status.playpic == 0) 170 { 171 drawscreen(playinfobarpic, 0, 0); 172 status.playpic = 1; 173 } 163 174 return; 164 175 }
Note: See TracChangeset
for help on using the changeset viewer.