Changeset 18988 for titan/plugins/mc

Timestamp:

12/08/12 09:14:37 (11 years ago)

Author:

obi

Message:

fix

File:

• titan/plugins/mc/mc_audioplayer.h (modified) (14 diffs)

titan/plugins/mc/mc_audioplayer.h

@@ -117 +117 @@
         addscreenrc(apskin, filelist);
 
-        char* savecmd = NULL;
+        char* lastid = NULL;
 
         while(1)
@@ -131 +131 @@
                         if(count > screensaver_delay && screensaver != NULL)
                         {
-//                              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)))
                                 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)))
                                         drawscreen(infobar, 0, 0);
@@ -140 +139 @@
                                         drawscreen(apskin, 0, 0);
                                 }
-
-
                         }
                         count = 0;
@@ -157 +154 @@
                 if(tmpview == 3 && filelist->select != NULL && count < screensaver_delay)
                 {
-                        char* cmd = NULL;
                         char* pic = NULL;
-
+                        int len1 = 0;
+                                        
                         if(filelist->select != NULL && filelist->select->input == NULL)
                         {
+
+                                if(status.play == 1)
+                                {
+                                        if(ostrcmp(lastid, filelist->select->name) == 0)                                        
+                                                continue;
+                                        else
+                                        {
+                                                free(lastid), lastid = NULL;
+                                                lastid = ostrcat(lastid, filelist->select->name, 1, 0);
+                                        }
+                                }
+
                                 struct mediadb* mnode = getmediadb(filelistpath->text, filelist->select->name, 0);
                                 if(mnode != NULL)
@@ -172 +181 @@
         
                                                 pic = ostrcat(tmpstr, "_cover.jpg", 0, 0);
-                                                cmd = ostrcat(tmpstr, "_backdrop.mvi", 0, 0);
                                                 free(tmpstr), tmpstr = NULL;
                                         }
 
-                                        if(mnode->plot != NULL)
+                                        len1 = strlen(mnode->plot);
+                                        if(mnode->plot != NULL && len1 != 0)
                                         {
                                                 changetext(album, mnode->plot);
@@ -188 +197 @@
                                         }
 
-                                        if(mnode->title != NULL)
-                                        {
-                                                if(mnode->actors != NULL)
+                                        len1 = strlen(mnode->plot);
+                                        if(mnode->title != NULL && len1 != 0)
+                                        {
+                                                len1 = strlen(mnode->actors);
+                                                if(mnode->actors != NULL && len1 != 0)                                  
                                                 {
                                                         tmpstr = ostrcat(tmpstr, mnode->actors, 1, 0);
@@ -223 +234 @@
                                                 }
                                                 else
-                                                        title->hidden = YES;
-
+                                                {
+                                                        changetext(title, filelist->select->name);
+                                                        title->hidden = NO;
+                                                }
                                                 free(tmpstr), tmpstr = NULL;
 
@@ -235 +248 @@
                                                 realname->hidden = YES;
                                                 realnametext->hidden = YES;
+                                                changetext(title, filelist->select->name);
+                                                title->hidden = NO;
                                         }                                       
 
-                                        if(mnode->actors != NULL)
+                                        len1 = strlen(mnode->actors);
+                                        if(mnode->actors != NULL && len1 != 0)
                                         {
                                                 changetext(actors, mnode->actors);
@@ -249 +265 @@
                                         }
 
-                                        if(mnode->genre != NULL)
+                                        len1 = strlen(mnode->genre);
+                                        if(mnode->genre != NULL && len1 != 0)
                                         {
                                                 changetext(genre, mnode->genre);
@@ -289 +306 @@
                                         free(pic), pic = NULL;
                                 }
-                                        
-                                drawscreen(apskin, 0, 0);
+
                                 if(file_exist(pic))
                                 {
@@ -302 +318 @@
                                 drawscreen(apskin, 0, 0);
                         }
-
-                        debug(50, "cmd: %s", cmd);      
-                        if(!file_exist(cmd)){
-                                free(cmd), cmd = NULL;
-                                cmd = ostrcat(cmd, "/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 1, 0);
-                        }
-
-                        if(savecmd == NULL)
-                        {
-                                singlepicstart(cmd, 0);
-                                free(savecmd), savecmd = NULL;
-                                savecmd = ostrcat(savecmd, cmd, 1, 0);
-                        }
                         else
                         {
-                                if(ostrcmp(savecmd, cmd) != 0)
-                                {
-                                        singlepicstart(cmd, 0);
-                                        free(savecmd), savecmd = NULL;
-                                        savecmd = ostrcat(savecmd, cmd, 1, 0);
-                                }
-                        }
-                        free(cmd), cmd = NULL;
-                }
-
+                                thumb->hidden = YES;
+                                album->hidden = YES;
+                                title->hidden = YES;
+                                actors->hidden = YES;
+                                year->hidden = YES;
+                                realname->hidden = YES;
+                                genre->hidden = YES;
+                                albumtext->hidden = YES;
+                                actorstext->hidden = YES;
+                                yeartext->hidden = YES;
+                                realnametext->hidden = YES;
+                                genretext->hidden = YES;
+                                free(pic), pic = NULL;
+                                drawscreen(apskin, 0, 0);
+
+                        }
+                        if(status.play == 1)
+                                drawscreen(infobar, 0, 0);
+                }
 
                 if(rcret == getrcconfigint("rc1", NULL))
@@ -505 +517 @@
 //                      {
                                 debug(50, "rcstop: stopplayback");
+                                drawscreen(blackscreen, 0, 0);
+                                drawscreen(loadmediadb, 0, 0);
                                 playerstop();
-
+                                singlepicstart("/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 0);
+                        
                                 filelist->hidden = NO;
                                 listbox->hidden = YES;
@@ -517 +532 @@
 
                                 drawscreen(apskin, 0, 0);
-
+                                clearscreen(loadmediadb);
+                                clearscreen(blackscreen);
+                        
                                 sleep(1);
                                 status.playspeed = 0;
@@ -543 +560 @@
                         }
 
+                        servicestop(status.aktservice, 1, 1);
                         playerstop();
-
+                        drawscreen(blackscreen, 0, 0);
+                        drawscreen(loadmediadb, 0, 0);
+        
                         sleep(1);
                         filelist->hidden = NO;