Changeset 18988 for titan/plugins/mc
- Timestamp:
- 12/08/12 09:14:37 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/mc/mc_audioplayer.h
r18986 r18988 117 117 addscreenrc(apskin, filelist); 118 118 119 char* savecmd = NULL;119 char* lastid = NULL; 120 120 121 121 while(1) … … 131 131 if(count > screensaver_delay && screensaver != NULL) 132 132 { 133 // if((rcret == getrcconfigint("rcfr", NULL)) || (rcret == getrcconfigint("rcff", NULL)) || (rcret == getrcconfigint("rcpause", NULL)) || (rcret == getrcconfigint("rc1", NULL)) || (rcret == getrcconfigint("rc3", NULL)) || (rcret == getrcconfigint("rc4", NULL)) || (rcret == getrcconfigint("rc6", NULL)) || (rcret == getrcconfigint("rc7", NULL)) || (rcret == getrcconfigint("rc9", NULL)))134 133 if((rcret == getrcconfigint("rcpause", NULL)) || (rcret == getrcconfigint("rc1", NULL)) || (rcret == getrcconfigint("rc3", NULL)) || (rcret == getrcconfigint("rc4", NULL)) || (rcret == getrcconfigint("rc6", NULL)) || (rcret == getrcconfigint("rc7", NULL)) || (rcret == getrcconfigint("rc9", NULL))) 135 134 drawscreen(infobar, 0, 0); … … 140 139 drawscreen(apskin, 0, 0); 141 140 } 142 143 144 141 } 145 142 count = 0; … … 157 154 if(tmpview == 3 && filelist->select != NULL && count < screensaver_delay) 158 155 { 159 char* cmd = NULL;160 156 char* pic = NULL; 161 157 int len1 = 0; 158 162 159 if(filelist->select != NULL && filelist->select->input == NULL) 163 160 { 161 162 if(status.play == 1) 163 { 164 if(ostrcmp(lastid, filelist->select->name) == 0) 165 continue; 166 else 167 { 168 free(lastid), lastid = NULL; 169 lastid = ostrcat(lastid, filelist->select->name, 1, 0); 170 } 171 } 172 164 173 struct mediadb* mnode = getmediadb(filelistpath->text, filelist->select->name, 0); 165 174 if(mnode != NULL) … … 172 181 173 182 pic = ostrcat(tmpstr, "_cover.jpg", 0, 0); 174 cmd = ostrcat(tmpstr, "_backdrop.mvi", 0, 0);175 183 free(tmpstr), tmpstr = NULL; 176 184 } 177 185 178 if(mnode->plot != NULL) 186 len1 = strlen(mnode->plot); 187 if(mnode->plot != NULL && len1 != 0) 179 188 { 180 189 changetext(album, mnode->plot); … … 188 197 } 189 198 190 if(mnode->title != NULL) 191 { 192 if(mnode->actors != NULL) 199 len1 = strlen(mnode->plot); 200 if(mnode->title != NULL && len1 != 0) 201 { 202 len1 = strlen(mnode->actors); 203 if(mnode->actors != NULL && len1 != 0) 193 204 { 194 205 tmpstr = ostrcat(tmpstr, mnode->actors, 1, 0); … … 223 234 } 224 235 else 225 title->hidden = YES; 226 236 { 237 changetext(title, filelist->select->name); 238 title->hidden = NO; 239 } 227 240 free(tmpstr), tmpstr = NULL; 228 241 … … 235 248 realname->hidden = YES; 236 249 realnametext->hidden = YES; 250 changetext(title, filelist->select->name); 251 title->hidden = NO; 237 252 } 238 253 239 if(mnode->actors != NULL) 254 len1 = strlen(mnode->actors); 255 if(mnode->actors != NULL && len1 != 0) 240 256 { 241 257 changetext(actors, mnode->actors); … … 249 265 } 250 266 251 if(mnode->genre != NULL) 267 len1 = strlen(mnode->genre); 268 if(mnode->genre != NULL && len1 != 0) 252 269 { 253 270 changetext(genre, mnode->genre); … … 289 306 free(pic), pic = NULL; 290 307 } 291 292 drawscreen(apskin, 0, 0); 308 293 309 if(file_exist(pic)) 294 310 { … … 302 318 drawscreen(apskin, 0, 0); 303 319 } 304 305 debug(50, "cmd: %s", cmd);306 if(!file_exist(cmd)){307 free(cmd), cmd = NULL;308 cmd = ostrcat(cmd, "/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 1, 0);309 }310 311 if(savecmd == NULL)312 {313 singlepicstart(cmd, 0);314 free(savecmd), savecmd = NULL;315 savecmd = ostrcat(savecmd, cmd, 1, 0);316 }317 320 else 318 321 { 319 if(ostrcmp(savecmd, cmd) != 0) 320 { 321 singlepicstart(cmd, 0); 322 free(savecmd), savecmd = NULL; 323 savecmd = ostrcat(savecmd, cmd, 1, 0); 324 } 325 } 326 free(cmd), cmd = NULL; 327 } 328 322 thumb->hidden = YES; 323 album->hidden = YES; 324 title->hidden = YES; 325 actors->hidden = YES; 326 year->hidden = YES; 327 realname->hidden = YES; 328 genre->hidden = YES; 329 albumtext->hidden = YES; 330 actorstext->hidden = YES; 331 yeartext->hidden = YES; 332 realnametext->hidden = YES; 333 genretext->hidden = YES; 334 free(pic), pic = NULL; 335 drawscreen(apskin, 0, 0); 336 337 } 338 if(status.play == 1) 339 drawscreen(infobar, 0, 0); 340 } 329 341 330 342 if(rcret == getrcconfigint("rc1", NULL)) … … 505 517 // { 506 518 debug(50, "rcstop: stopplayback"); 519 drawscreen(blackscreen, 0, 0); 520 drawscreen(loadmediadb, 0, 0); 507 521 playerstop(); 508 522 singlepicstart("/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 0); 523 509 524 filelist->hidden = NO; 510 525 listbox->hidden = YES; … … 517 532 518 533 drawscreen(apskin, 0, 0); 519 534 clearscreen(loadmediadb); 535 clearscreen(blackscreen); 536 520 537 sleep(1); 521 538 status.playspeed = 0; … … 543 560 } 544 561 562 servicestop(status.aktservice, 1, 1); 545 563 playerstop(); 546 564 drawscreen(blackscreen, 0, 0); 565 drawscreen(loadmediadb, 0, 0); 566 547 567 sleep(1); 548 568 filelist->hidden = NO;
Note: See TracChangeset
for help on using the changeset viewer.