Changeset 19974
- Timestamp:
- 02/07/13 00:07:27 (10 years ago)
- Location:
- titan
- Files:
-
- 10 edited
-
plugins/TopfieldVFD/TopfieldVFD.c (modified) (1 diff)
-
plugins/dlna/dlna.h (modified) (1 diff)
-
plugins/dvdplayer/dvdplay.h (modified) (6 diffs)
-
plugins/mc/mc_audioplayer.h (modified) (4 diffs)
-
plugins/mc/mc_global.h (modified) (3 diffs)
-
plugins/mc/mc_header.h (modified) (2 diffs)
-
plugins/mc/mc_pictureplayer.h (modified) (9 diffs)
-
plugins/mc/mc_videoplayer.h (modified) (15 diffs)
-
plugins/tithek/tithek.h (modified) (2 diffs)
-
titan/header.h (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/TopfieldVFD/TopfieldVFD.c
r18405 r19974 51 51 if(checkbox("TF7700")) 52 52 { 53 deltimer(TopfieldVFDstimerthread );53 deltimer(TopfieldVFDstimerthread, 1); 54 54 pluginaktiv = 0; 55 55 debug(10, "TopfieldVFD removed !!!"); -
titan/plugins/dlna/dlna.h
r19542 r19974 228 228 void screendlna() 229 229 { 230 int rcret = -1, ret = 0 , i = 0;230 int rcret = -1, ret = 0; 231 231 struct skin* dlna = getscreen("dlnasettings"); 232 232 struct skin* listbox = getscreennode(dlna, "listbox"); -
titan/plugins/dvdplayer/dvdplay.h
r18973 r19974 55 55 56 56 drawscreen(skin, 0, 0); 57 playwritevfd(file );57 playwritevfd(file, NULL); 58 58 rcret = dvdstart(file); 59 59 #ifndef SIMULATE … … 71 71 #endif 72 72 73 //screenplayinfobar(file, 0, playertype, flag);73 //screenplayinfobar(file, NULL, 0, playertype, flag); 74 74 75 75 //change codec if ac3default and video has ac3 … … 91 91 playinfobarcount++; 92 92 if(playinfobarstatus > 0) 93 screenplayinfobar(file, 0, playertype, flag);93 screenplayinfobar(file, NULL, 0, playertype, flag); 94 94 if(playinfobarstatus == 1 && playinfobarcount >= getconfigint("infobartimeout", NULL) * 10) 95 95 { 96 96 playinfobarstatus = 0; 97 screenplayinfobar(NULL, 1, playertype, flag);97 screenplayinfobar(NULL, NULL, 1, playertype, flag); 98 98 } 99 99 … … 114 114 if(playinfobarstatus == 1) 115 115 { 116 screenplayinfobar(NULL, 1, playertype, flag);116 screenplayinfobar(NULL, NULL, 1, playertype, flag); 117 117 playinfobarstatus = 0; 118 118 } … … 123 123 124 124 //if(rcret == getrcconfigint("rcyellow", NULL)) 125 // playrcyellow(file, playinfobarstatus, playertype, flag);125 // playrcyellow(file, NULL, playinfobarstatus, playertype, flag); 126 126 127 127 //if(rcret == getrcconfigint("rctext", NULL) || rcret == getrcconfigint("rcsubtitel", NULL)) 128 // playrctext(file, playinfobarstatus, playertype, flag);128 // playrctext(file, NULL, playinfobarstatus, playertype, flag); 129 129 130 130 if(rcret == getrcconfigint("rcgreen", NULL)) 131 131 { 132 playrcgreen(file, playinfobarstatus, playertype, flag);132 playrcgreen(file, NULL, playinfobarstatus, playertype, flag); 133 133 dvdchangevideo(); 134 134 } 135 135 136 136 if(rcret == getrcconfigint("rcred", NULL)) 137 playrcred(file, playinfobarstatus, playertype, flag);137 playrcred(file, NULL, playinfobarstatus, playertype, flag); 138 138 139 139 if(rcret == getrcconfigint("rcinfo", NULL)) 140 playrcinfo(file, &playinfobarstatus, &playinfobarcount, playertype, flag);140 playrcinfo(file, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 141 141 142 142 if(rcret == getrcconfigint("rcff", NULL)) 143 playrcff(file, &playinfobarstatus, &playinfobarcount, playertype, flag);143 playrcff(file, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 144 144 145 145 if(rcret == getrcconfigint("rcfr", NULL)) 146 playrcfr(file, &playinfobarstatus, &playinfobarcount, playertype, flag);146 playrcfr(file, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 147 147 148 148 if(rcret == getrcconfigint("rcpause", NULL)) 149 playrcpause(file, &playinfobarstatus, &playinfobarcount, playertype, flag);149 playrcpause(file, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 150 150 151 151 if(rcret == getrcconfigint("rcplay", NULL)) 152 playrcplay(file, &playinfobarstatus, &playinfobarcount, playertype, flag);152 playrcplay(file, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 153 153 154 154 if(rcret == getrcconfigint("rc1", NULL)) 155 playrcjumpr(file, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag);155 playrcjumpr(file, NULL, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag); 156 156 157 157 if(rcret == getrcconfigint("rc4", NULL)) 158 playrcjumpr(file, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag);158 playrcjumpr(file, NULL, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag); 159 159 160 160 if(rcret == getrcconfigint("rc7", NULL)) 161 playrcjumpr(file, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag);161 playrcjumpr(file, NULL, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag); 162 162 163 163 if(rcret == getrcconfigint("rc3", NULL)) 164 playrcjumpf(file, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag);164 playrcjumpf(file, NULL, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag); 165 165 166 166 if(rcret == getrcconfigint("rc6", NULL)) 167 playrcjumpf(file, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag);167 playrcjumpf(file, NULL, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag); 168 168 169 169 if(rcret == getrcconfigint("rc9", NULL)) 170 playrcjumpf(file, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag);170 playrcjumpf(file, NULL, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag); 171 171 } 172 172 //don't change this sleep, without this … … 178 178 179 179 writevfd("DVD"); 180 screenplayinfobar(file, 1, playertype, flag);180 screenplayinfobar(file, NULL, 1, playertype, flag); 181 181 182 182 if(startfile == NULL) -
titan/plugins/mc/mc_audioplayer.h
r19054 r19974 326 326 { 327 327 if((status.play == 1) || (status.playspeed != 0)) 328 playrcjumpr(filename, 10, &playinfobarstatus, &playinfobarcount, playertype, flag);328 playrcjumpr(filename, NULL, 10, &playinfobarstatus, &playinfobarcount, playertype, flag); 329 329 } 330 330 else if(rcret == getrcconfigint("rc4", NULL)) 331 331 { 332 332 if((status.play == 1) || (status.playspeed != 0)) 333 playrcjumpr(filename, 30, &playinfobarstatus, &playinfobarcount, playertype, flag);333 playrcjumpr(filename, NULL, 30, &playinfobarstatus, &playinfobarcount, playertype, flag); 334 334 } 335 335 else if(rcret == getrcconfigint("rc7", NULL)) 336 336 { 337 337 if((status.play == 1) || (status.playspeed != 0)) 338 playrcjumpr(filename, 60, &playinfobarstatus, &playinfobarcount, playertype, flag);338 playrcjumpr(filename, NULL, 60, &playinfobarstatus, &playinfobarcount, playertype, flag); 339 339 } 340 340 else if(rcret == getrcconfigint("rc3", NULL)) 341 341 { 342 342 if((status.play == 1) || (status.playspeed != 0)) 343 playrcjumpf(filename, 10, &playinfobarstatus, &playinfobarcount, playertype, flag);343 playrcjumpf(filename, NULL, 10, &playinfobarstatus, &playinfobarcount, playertype, flag); 344 344 } 345 345 else if(rcret == getrcconfigint("rc6", NULL)) 346 346 { 347 347 if((status.play == 1) || (status.playspeed != 0)) 348 playrcjumpf(filename, 30, &playinfobarstatus, &playinfobarcount, playertype, flag);348 playrcjumpf(filename, NULL, 30, &playinfobarstatus, &playinfobarcount, playertype, flag); 349 349 } 350 350 else if(rcret == getrcconfigint("rc9", NULL)) 351 351 { 352 352 if((status.play == 1) || (status.playspeed != 0)) 353 playrcjumpf(filename, 60, &playinfobarstatus, &playinfobarcount, playertype, flag);353 playrcjumpf(filename, NULL, 60, &playinfobarstatus, &playinfobarcount, playertype, flag); 354 354 } 355 355 else if(rcret == getrcconfigint("rcff", NULL)) 356 356 { 357 357 if((status.play == 1) || (status.playspeed != 0)) 358 playrcff(filename, &playinfobarstatus, &playinfobarcount, playertype, 2);358 playrcff(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, 2); 359 359 } 360 360 else if(rcret == getrcconfigint("rcfr", NULL)) 361 361 { 362 362 if((status.play == 1) || (status.playspeed != 0)) 363 playrcfr(filename, &playinfobarstatus, &playinfobarcount, playertype, 2);363 playrcfr(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, 2); 364 364 } 365 365 else if(rcret == getrcconfigint("rcplay", NULL)) 366 366 { 367 367 if((status.play == 1) || (status.playspeed != 0)) 368 playrcplay(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);368 playrcplay(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 369 369 //showplaylist(1); 370 370 } … … 378 378 } 379 379 if((status.play == 1) || (status.pause == 1)) 380 playrcpause(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);380 playrcpause(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 381 381 } 382 382 else if((rcret == getrcconfigint("rcchdown", NULL)) || (rcret == getrcconfigint("rcnext", NULL))) … … 587 587 588 588 playerret = playerstart(filename); 589 playwritevfd(filename );589 playwritevfd(filename, NULL); 590 590 591 591 #ifndef SIMULATE … … 684 684 eof = 0; 685 685 playerret = playerstart(filename); 686 playwritevfd(filename );686 playwritevfd(filename, NULL); 687 687 688 688 #ifndef SIMULATE -
titan/plugins/mc/mc_global.h
r19053 r19974 757 757 playerret = playerstart(*filename); 758 758 759 playwritevfd(*filename );759 playwritevfd(*filename, NULL); 760 760 761 761 … … 1002 1002 playerret = playerstart(*filename); 1003 1003 1004 playwritevfd(*filename );1004 playwritevfd(*filename, NULL); 1005 1005 1006 //playwritevfd(*filename );1006 //playwritevfd(*filename, NULL); 1007 1007 #ifndef SIMULATE 1008 1008 if(playerret != 0) … … 1016 1016 status.play = 1; 1017 1017 if(flag == 1) 1018 screenplayinfobar(*filename, 0, 0, 0);1018 screenplayinfobar(*filename, NULL, 0, 0, 0); 1019 1019 } 1020 1020 -
titan/plugins/mc/mc_header.h
r19893 r19974 3 3 4 4 void picplayer(struct skin* picscreen, struct skin* picture, struct skin* picname, char* filename, int flag); 5 struct clist* addconfigscreen(char *key, struct skin *node);6 5 7 6 //void screenmc_audioplayer(); … … 9 8 10 9 //void mc_videoplayer_infobar(struct skin* apskin, struct skin* infobar, struct skin* spos, struct skin* slen, struct skin* sreverse, struct skin* sprogress, char* filename); 11 void screenplayinfobar(char* file, int mode, int playertype, int flag); 12 void playrcblue(char* file, int playinfobarstatus, int playertype, int flag); 13 void playrcyellow(char* file, int playinfobarstatus, int playertype, int flag); 14 void playrcred(char* file, int playinfobarstatus, int playertype, int flag); 15 void playrcgreen(char* file, int playinfobarstatus, int playertype, int flag); 16 void playrctext(char* file, int playinfobarstatus, int playertype, int flag); 17 void playrcok(char* file, int playinfobarstatus, int playertype, int flag); 18 void playrcplay(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 19 20 //global.h 21 void setosdtransparent(int value); 22 23 // mc_audioplayer.h 24 //void playereof(struct skin* apskin, struct skin* filelist, struct skin* listbox, struct skin* filelistpath, struct skin* b2, int* skip, int* eof, int* playlist, int flag); 25 //void playerrandom(struct skin* apskin, struct skin* filelist, struct skin* listbox, struct skin* b3, int* playlist, int flag); 26 //void showplaylist(struct skin* apskin, struct skin* filelistpath, struct skin* filelist, struct skin* listbox1, struct skin* b2, int mode, int* playlist, int* eof); 27 //void mc_audioplayer_infobar(struct skin* apskin, struct skin* infobar, struct skin* spos, struct skin* slen, struct skin* sreverse, struct skin* sprogress, char* filename); 28 29 // playlist.h 30 void getplaylistmaxold(struct skin* playlist, int* maxdirs, int* maxfiles); 31 struct skin* getplaylistrandomold(struct skin* playlist, int maxdirs, int maxfiles); 32 33 // menu.h 34 struct skin* menu(struct skin* menu); 35 36 // filelist.h 37 void getfilelistmax(struct skin* filelist, int* maxdirs, int* maxfiles); 38 //void getfilelist(struct skin* input, struct skin* filelistpath, struct skin* filelist, char* path, char* filemask, int tmpview, char* selection); 39 void getfilelist(struct skin* input, struct skin* filelistpath, struct skin* filelist, char* path, char* filemask, int tmpview, char* selection); 40 struct skin* getfilelistrandom(struct skin* filelist, int maxdirs, int maxfiles); 41 42 // play.h 43 void playrcjumpr(char* file, int sec, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 44 void playrcjumpf(char* file, int sec, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 45 void playrcpause(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 46 void playrcff(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 47 void playrcfr(char* file, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 48 void playwritevfd(char* file); 49 50 // rc.h 51 int writerc(int keycode); 10 void screenplayinfobar(char* file, char* showname, int mode, int playertype, int flag); 11 void playrcblue(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 12 void playrcyellow(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 13 void playrcred(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 14 void playrcgreen(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 15 void playrctext(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 16 void playrcok(char* file, char* showname, int playinfobarstatus, int playertype, int flag); 17 void playrcplay(char* file, char* showname, int* playinfobarstatus, int* playinfobarcount, int playertype, int flag); 52 18 53 19 // mc_settings.h -
titan/plugins/mc/mc_pictureplayer.h
r19952 r19974 88 88 { 89 89 playerret = playerstart(track); 90 playwritevfd(track );90 playwritevfd(track, NULL); 91 91 92 92 #ifndef SIMULATE … … 117 117 { 118 118 if((status.play == 1) || (status.playspeed != 0)) 119 playrcplay(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);119 playrcplay(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 120 120 } 121 121 else if(rcret == getrcconfigint("rcpause", NULL)) 122 122 { 123 123 if((status.play == 1) || (status.pause == 1)) 124 playrcpause(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);124 playrcpause(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 125 125 } 126 126 else if((rcret == getrcconfigint("rcchdown", NULL)) || (rcret == getrcconfigint("rcprev", NULL))) … … 156 156 { 157 157 if(status.play == 1) 158 playrcred(filename, playinfobarstatus, playertype, flag);158 playrcred(filename, NULL, playinfobarstatus, playertype, flag); 159 159 else 160 160 { … … 176 176 { 177 177 if(status.play == 1) 178 playrcgreen(filename, playinfobarstatus, playertype, flag);178 playrcgreen(filename, NULL, playinfobarstatus, playertype, flag); 179 179 else 180 180 { … … 187 187 { 188 188 if(status.play == 1) 189 playrctext(filename, playinfobarstatus, playertype, flag);189 playrctext(filename, NULL, playinfobarstatus, playertype, flag); 190 190 } 191 191 else if(rcret == getrcconfigint("rcmenu", NULL)) … … 225 225 { 226 226 playerret = playerstart(track); 227 playwritevfd(filename );227 playwritevfd(filename, NULL); 228 228 229 229 #ifndef SIMULATE … … 347 347 { 348 348 playerret = playerstart(filename); 349 playwritevfd(filename );349 playwritevfd(filename, NULL); 350 350 351 351 #ifndef SIMULATE … … 370 370 } 371 371 372 screenplayinfobar(filename, 0, playertype, 0);372 screenplayinfobar(filename, NULL, 0, playertype, 0); 373 373 status.play = 1; 374 374 } … … 444 444 { 445 445 playerret = playerstart(track); 446 playwritevfd(filename );446 playwritevfd(filename, NULL); 447 447 448 448 #ifndef SIMULATE -
titan/plugins/mc/mc_videoplayer.h
r19054 r19974 109 109 if(playinfobarstatus > 0) 110 110 { 111 screenplayinfobar(filename, 0, playertype, 0);111 screenplayinfobar(filename, NULL, 0, playertype, 0); 112 112 } 113 113 if(playinfobarstatus == 1 && playinfobarcount >= getconfigint("infobartimeout", NULL)) 114 114 { 115 115 playinfobarstatus = 0; 116 screenplayinfobar(NULL, 1, playertype, 0);116 screenplayinfobar(NULL, NULL, 1, playertype, 0); 117 117 } 118 118 } … … 323 323 { 324 324 if((status.play == 1) || (status.playspeed != 0)) 325 playrcjumpr(filename, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag);325 playrcjumpr(filename, NULL, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag); 326 326 } 327 327 else if(rcret == getrcconfigint("rc4", NULL)) 328 328 { 329 329 if((status.play == 1) || (status.playspeed != 0)) 330 playrcjumpr(filename, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag);330 playrcjumpr(filename, NULL, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag); 331 331 } 332 332 else if(rcret == getrcconfigint("rc7", NULL)) 333 333 { 334 334 if((status.play == 1) || (status.playspeed != 0)) 335 playrcjumpr(filename, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag);335 playrcjumpr(filename, NULL, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag); 336 336 } 337 337 else if(rcret == getrcconfigint("rc3", NULL)) 338 338 { 339 339 if((status.play == 1) || (status.playspeed != 0)) 340 playrcjumpf(filename, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag);340 playrcjumpf(filename, NULL, skip13, &playinfobarstatus, &playinfobarcount, playertype, flag); 341 341 } 342 342 else if(rcret == getrcconfigint("rc6", NULL)) 343 343 { 344 344 if((status.play == 1) || (status.playspeed != 0)) 345 playrcjumpf(filename, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag);345 playrcjumpf(filename, NULL, skip46, &playinfobarstatus, &playinfobarcount, playertype, flag); 346 346 } 347 347 else if(rcret == getrcconfigint("rc9", NULL)) 348 348 { 349 349 if((status.play == 1) || (status.playspeed != 0)) 350 playrcjumpf(filename, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag);350 playrcjumpf(filename, NULL, skip79, &playinfobarstatus, &playinfobarcount, playertype, flag); 351 351 } 352 352 else if(rcret == getrcconfigint("rcleft", NULL)) 353 353 { 354 354 if((status.play == 1) || (status.playspeed != 0)) 355 playrcjumpr(filename, 60, &playinfobarstatus, &playinfobarcount, playertype, flag);355 playrcjumpr(filename, NULL, 60, &playinfobarstatus, &playinfobarcount, playertype, flag); 356 356 } 357 357 else if(rcret == getrcconfigint("rcright", NULL)) 358 358 { 359 359 if((status.play == 1) || (status.playspeed != 0)) 360 playrcjumpf(filename, 60, &playinfobarstatus, &playinfobarcount, playertype, flag);360 playrcjumpf(filename, NULL, 60, &playinfobarstatus, &playinfobarcount, playertype, flag); 361 361 } 362 362 else if(rcret == getrcconfigint("rcdown", NULL)) 363 363 { 364 364 if((status.play == 1) || (status.playspeed != 0)) 365 playrcjumpr(filename, 600, &playinfobarstatus, &playinfobarcount, playertype, flag);365 playrcjumpr(filename, NULL, 600, &playinfobarstatus, &playinfobarcount, playertype, flag); 366 366 } 367 367 else if(rcret == getrcconfigint("rcup", NULL)) 368 368 { 369 369 if((status.play == 1) || (status.playspeed != 0)) 370 playrcjumpf(filename, 600, &playinfobarstatus, &playinfobarcount, playertype, flag);370 playrcjumpf(filename, NULL, 600, &playinfobarstatus, &playinfobarcount, playertype, flag); 371 371 } 372 372 … … 374 374 { 375 375 if((status.play == 1) || (status.playspeed != 0)) 376 playrcff(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);376 playrcff(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 377 377 } 378 378 else if(rcret == getrcconfigint("rcfr", NULL)) 379 379 { 380 380 if((status.play == 1) || (status.playspeed != 0)) 381 playrcfr(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);381 playrcfr(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 382 382 } 383 383 else if(rcret == getrcconfigint("rcplay", NULL)) 384 384 { 385 385 // if((status.play == 1) || (status.playspeed != 0)) 386 // playrcplay(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);386 // playrcplay(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 387 387 if((status.play == 1) || (status.pause == 1)) 388 playrcpause(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);388 playrcpause(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 389 389 } 390 390 else if(rcret == getrcconfigint("rcpause", NULL)) 391 391 { 392 392 if((status.play == 1) || (status.pause == 1)) 393 playrcpause(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);393 playrcpause(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 394 394 } 395 395 else if(rcret == getrcconfigint("rcnext", NULL)) … … 406 406 { 407 407 if(status.play == 1) 408 playrcblue(filename, playinfobarstatus, playertype, flag);408 playrcblue(filename, NULL, playinfobarstatus, playertype, flag); 409 409 else 410 410 { … … 426 426 { 427 427 if(status.play == 1) 428 playrcyellow(filename, playinfobarstatus, playertype, flag);428 playrcyellow(filename, NULL, playinfobarstatus, playertype, flag); 429 429 else 430 430 playerrandom(apskin, filelist, listbox, b3, playlist, flag); … … 433 433 { 434 434 if(status.play == 1) 435 playrcred(filename, playinfobarstatus, playertype, flag);435 playrcred(filename, NULL, playinfobarstatus, playertype, flag); 436 436 else 437 437 { … … 457 457 { 458 458 if(status.play == 1) 459 playrcgreen(filename, playinfobarstatus, playertype, flag);459 playrcgreen(filename, NULL, playinfobarstatus, playertype, flag); 460 460 else 461 461 { … … 468 468 { 469 469 if(status.play == 1) 470 playrctext(filename, playinfobarstatus, playertype, flag);470 playrctext(filename, NULL, playinfobarstatus, playertype, flag); 471 471 } 472 472 else if(rcret == getrcconfigint("rcmenu", NULL)) … … 523 523 filename = createpath(filelistpath->text, filelist->select->name); 524 524 debug(133, "filename: %s", filename); 525 playrcred(filename, playinfobarstatus, playertype, flag);525 playrcred(filename, NULL, playinfobarstatus, playertype, flag); 526 526 } 527 527 } 528 528 else 529 playrcplay(filename, &playinfobarstatus, &playinfobarcount, playertype, flag);529 playrcplay(filename, NULL, &playinfobarstatus, &playinfobarcount, playertype, flag); 530 530 531 531 if(status.play == 0 && status.pause == 0) … … 666 666 if((status.play == 1) || (status.playspeed != 0)) 667 667 { 668 playrcok(filename, playinfobarstatus, playertype, flag);668 playrcok(filename, NULL, playinfobarstatus, playertype, flag); 669 669 continue; 670 670 } … … 719 719 playerret = playerstart(filename); 720 720 721 playwritevfd(filename );721 playwritevfd(filename, NULL); 722 722 723 723 #ifndef SIMULATE … … 740 740 #endif 741 741 742 screenplayinfobar(filename, 0, playertype, 0);742 screenplayinfobar(filename, NULL, 0, playertype, 0); 743 743 status.play = 1; 744 744 … … 856 856 playerret = playerstart(filename); 857 857 858 playwritevfd(filename );858 playwritevfd(filename, NULL); 859 859 860 860 #ifndef SIMULATE … … 886 886 { 887 887 fscanf(fbseek,"%s",skip1); 888 playrcjumpf(filename, atoll(skip1), &playinfobarstatus, &playinfobarcount, playertype, flag);888 playrcjumpf(filename, NULL, atoll(skip1), &playinfobarstatus, &playinfobarcount, playertype, flag); 889 889 } 890 890 free(skip1), skip1 = NULL; … … 900 900 901 901 clearscreen(loadmediadb); 902 screenplayinfobar(filename, 0, playertype, 0);902 screenplayinfobar(filename, NULL, 0, playertype, 0); 903 903 status.play = 1; 904 904 -
titan/plugins/tithek/tithek.h
r19953 r19974 743 743 if(rcret == 1) return; 744 744 } 745 screenplay(node->filename, node-> title, 2, flag);745 screenplay(node->filename, node->filename, 2, flag); 746 746 if(status.mcaktiv == 0) 747 747 servicecheckret(servicestart(status.lastservice->channel, NULL, NULL, 0), 0); … … 1637 1637 debug(99, "tmpstr: %s", tmpstr); 1638 1638 1639 playrcred(tmpstr, 1, 0, 99);1639 playrcred(tmpstr, NULL, 1, 0, 99); 1640 1640 free(tmpstr), tmpstr = NULL; 1641 1641 } -
titan/titan/header.h
r19953 r19974 258 258 int videoclearbuffer(struct dvbdev* node); 259 259 int videogetpts(struct dvbdev* node, uint64_t* pts); 260 int videoslowmotion(struct dvbdev* node, int frames); 260 261 261 262 // scan.h … … 287 288 int getplaylistmax(struct playlist* plist); 288 289 struct playlist* getplaylistrandom(struct playlist* plist, int max); 290 void getplaylistmaxold(struct skin* playlist, int* maxdirs, int* maxfiles); 291 struct skin* getplaylistrandomold(struct skin* playlist, int maxdirs, int maxfiles); 289 292 290 293 // screensaveradjust.h … … 467 470 void getfilelist(struct skin* input, struct skin* filelistpath, struct skin* filelist, char* path, char* filemask, int tmpview, char* selection); 468 471 int createfilelist(struct skin* screen, struct skin* node, int view); 472 void getfilelistmax(struct skin* filelist, int* maxdirs, int* maxfiles); 473 struct skin* getfilelistrandom(struct skin* filelist, int maxdirs, int maxfiles); 469 474 470 475 //plugin.h … … 561 566 //menu.h 562 567 int menucall(struct skin* menunode, struct skin* menuentry, int check); 568 struct skin* menu(struct skin* menu); 563 569 564 570 //textbox.h … … 569 575 void delconfigtmpall(); 570 576 struct clist* addconfigscreencheck(char *key, struct skin *node, char* check); 577 struct clist* addconfigscreen(char *key, struct skin *node); 571 578 struct clist* addconfigdef(char *key, char *value); 572 579 struct clist* addconfigtmp(char *key, char *value); … … 588 595 void delrc(int key, struct skin* owner, struct skin* screennode); 589 596 int flushrc(unsigned int timeout); 597 int writerc(int keycode); 590 598 591 599 //rcfunc.h
Note: See TracChangeset
for help on using the changeset viewer.
