Changeset 18831 for titan/plugins/mc

Timestamp:

11/28/12 23:03:34 (11 years ago)

Author:

obi

Message:

[titan] mc ap/vp fix double mediadb scanning on playback

Location:

titan/plugins/mc

Files:

• mc_audioplayer.h (modified) (4 diffs)
• mc_videoplayer.h (modified) (5 diffs)

titan/plugins/mc/mc_audioplayer.h

@@ -39 +39 @@
         struct skin* b4 = getscreennode(apskin, "b4");
 
-        struct skin* plot = getscreennode(apskin, "plot");
         struct skin* title = getscreennode(apskin, "title");
         struct skin* thumb = getscreennode(apskin, "thumb");
-        struct skin* actorstext = getscreennode(apskin, "actorstext");
         struct skin* actors = getscreennode(apskin, "actors");
-        struct skin* genretext = getscreennode(apskin, "genretext");
         struct skin* genre = getscreennode(apskin, "genre");
-        struct skin* yeartext = getscreennode(apskin, "yeartext");
         struct skin* year = getscreennode(apskin, "year");
-        struct skin* realnametext = getscreennode(apskin, "realnametext");
         struct skin* realname = getscreennode(apskin, "realname");
-        struct skin* albumtext = getscreennode(apskin, "albumtext");
         struct skin* album = getscreennode(apskin, "album");
 
@@ -420 +414 @@
 
                                 writevfd("AudioPlayer Filelist-Mode");
+                                unlink("/tmp/.autoscan");
+                                unlink("/tmp/.autoscan.ap");
 //                      }
                 }
@@ -454 +450 @@
                         writevfd("Mediacenter");
                         
-                        printf("exit: view=%d tmpview=%d\n", view, tmpview);                    
+                        printf("exit: view=%d tmpview=%d\n", view, tmpview);
+                        unlink("/tmp/.autoscan");
+                        unlink("/tmp/.autoscan.ap");                    
                         break;
                 }
@@ -584 +582 @@
                                 singlepicstart("/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 0);
 
-                                if(getconfigint("mc_ap_autoscan", NULL) == 1)
-                                {
+                                if(getconfigint("mc_ap_autoscan", NULL) == 1 && !file_exist("/tmp/.autoscan.ap"))
+                                {
+                                        writesys("/tmp/.autoscan.ap", "", 0);
                                         writesys("/tmp/.autoscan", "", 0);
                                         mediadbscan(filelistpath->text, 1001, 1);

titan/plugins/mc/mc_videoplayer.h

@@ -337 +337 @@
                                 singlepicstart("/var/usr/local/share/titan/plugins/mc/skin/default.mvi", 0);
                                 view = getconfigint("mc_vp_view", NULL);
+                                printf("view in: %d\n", view);
+                                printf("tmpview in: %d\n", tmpview);
 
                                 screenmc_videoplayer_settings();
@@ -354 +356 @@
                                         free(tmpstr), tmpstr = NULL;
                                 }
+
+                                printf("1view in: %d\n", view);
+                                printf("1tmpview in: %d\n", tmpview);
                                 
                                 mc_changeview(tmpview, filelist, apskin, flag);
@@ -361 +366 @@
                                 drawscreen(blackscreen, 0, 0);
                                 drawscreen(loadmediadb, 0, 0);
+                                printf("2view in: %d\n", view);
+                                printf("2tmpview in: %d\n", tmpview);
         
                                 delownerrc(apskin);
@@ -446 +453 @@
                         writevfd("VideoPlayer Filelist-Mode");
                         unlink("/tmp/.autoscan");
+                        unlink("/tmp/.autoscan.vp");
                                 
 //                      startmediadb();
@@ -502 +510 @@
                         printf("exit: view=%d tmpview=%d\n", view, tmpview);
                         unlink("/tmp/.autoscan");
+                        unlink("/tmp/.autoscan.vp");
                         break;
                 }