Changeset 16624

Timestamp:

06/17/12 13:20:00 (12 years ago)

Author:

nit

Message:

[titan] update tmc, change playlist random/max to get data direkt from playlist and not from skin

Location:

titan

Files:

• plugins/tmc/tmc.h (modified) (6 diffs)
• titan/playlist.h (modified) (1 diff)

titan/plugins/tmc/tmc.h

@@ -10 +10 @@
 //Mainmenu
 int menu0pos = 0;
-char* menu0[] = {"skin/tmcsettings.png", "skin/tmcpicture.png", "skin/tmcvideo.png", "skin/tmcaudio.png", "skin/tmcexit.png"};
-char* menu0txt[] = {"Settings", "Picture", "Video", "Audio", "Exit"};
+char* menu0[] = {"skin/tmcsettings.png", "skin/tmcpicture.png", "skin/tmcvideo.png", "skin/tmcaudio.png", "skin/tmcplaylist.png", "skin/tmcexit.png"};
+char* menu0txt[] = {"Settings", "Picture", "Video", "Audio", "Playlist", "Exit"};
 
 //Settings
 int menu1pos = 0;
-char* menu1[] = {"skin/tmcscan.png", "skin/tmcscandir.png", "skin/tmcsettings.png", "skin/tmcdb.png", "skin/tmcback.png"};
-char* menu1txt[] = {"Scan All", "Scan Dir", "Main", "Database Info", "Back"};
+char* menu1[] = {"skin/tmcscan.png", "skin/tmcscandir.png", "skin/tmcsettings.png", "skin/tmcdb.png", "skin/tmceditplaylist.png", "skin/tmcback.png"};
+char* menu1txt[] = {"Scan All", "Scan Dir", "Main", "Database Info", "Playlist Edit", "Back"};
 
 //Picture
@@ -545 +545 @@
 }
 
+//flag 0: editmode
+//flag 1: showmode
+struct mainplaylist* screentmcplaylist(int flag)
+{
+//TODO:
+        struct mainplaylist* mplaylist = NULL;
+        struct skin* playlist = getscreen("playlist");
+        char* bg = NULL;
+
+        drawscreen(playlist, 2, 0);
+        bg = savescreen(playlist);
+
+        mplaylist = screenmainplaylist(flag);
+
+        restorescreen(bg, playlist);
+        blitfb(0);
+
+        return mplaylist;
+}
+
 void screentmcedit(char* file, int menuid)
 {
@@ -955 +975 @@
 {
         int rcret = 0, menuid = 0, active = 1;
-        int audioplaytype = 0, picplaytype = 0;
+        int audioplaytype = 0, picplaytype = 0, playlistplaytype = 0;
         struct skin* tmcbg = getscreen("tmcbg");
         struct skin* load = getscreen("loading");
@@ -1151 +1171 @@
                                         screentmcdb();
                                 }
+                                else if(menuid == 1 && ostrcmp("Playlist Edit", tmcmenutxt->ret) == 0)
+                                {
+                                        screentmcplaylist(0);
+                                }
                                 else if(menuid == 1 && ostrcmp("Main", tmcmenutxt->ret) == 0)
                                 {
@@ -1382 +1406 @@
                                         tmcmenuscroll(menuid, active, tmcmenutxt, tmcmenu1, tmcmenu2, tmcmenu3, tmcmenu3p2, tmcmenu4, tmcmenu5, 0);
                                 }
+                                else if(ostrcmp("Playlist", tmcmenutxt->ret) == 0) //playlist
+                                {
+                                        int playlistret = 0;
+                                        struct mainplaylist* mplaylist = NULL;
+
+                                        mplaylist = screentmcplaylist(1);
+                                        if(mplaylist != NULL)
+                                        {
+                                                struct playlist* plist = mplaylist->playlist;
+                                                drawscreen(skin, 0, 0);
+                                                if(servicestop(status.aktservice, 1, 1) == 0)
+                                                {
+                                                        while(plist != NULL)
+                                                        {
+                                                                //TODO: play playlist
+                                                                playlistret = screenplay(plist->file, 0, 0);
+                                                                if(playlistret == 1 || playlistret == 2) break;
+
+                                                                if(playlistplaytype == 2) //random
+                                                                        plist = getplaylistrandom(mplaylist->playlist, getplaylistmax(mplaylist->playlist));
+                                                                else //next
+                                                                        plist = plist->next;
+                                                        }
+
+                                                        playstartservice();
+                                                }
+
+                                                drawscreen(tmcbg, 0, 1);
+                                                tmcpicscroll(menuid, tmcpictitle, tmcpicstar, tmcstatus, tmcpic1, tmcpic2, tmcpic3, tmcpic4, tmcpic5, tmcpictitlebg, tmcpicstarbg, tmcstatusbg, 0);
+                                                tmcmenuscroll(menuid, active, tmcmenutxt, tmcmenu1, tmcmenu2, tmcmenu3, tmcmenu3p2, tmcmenu4, tmcmenu5, 0);
+                                        }
+                                }
 
                                 continue;
@@ -1406 +1462 @@
                                         mfilter = mediadbfilterpos;
 
-                                        if(servicestop(status.aktservice, 1, 1) == 1)
+                                        if(servicestop(status.aktservice, 1, 1) == 0)
                                         if(rcret == 0)
                                         {

titan/titan/playlist.h

@@ -492 +492 @@
 }
 
-void getplaylistmax(struct skin* playlist, int* maxdirs, int* maxfiles)
-{
-        struct skin* node = playlist;
-
-        while(node != NULL)
-        {
-                if(node->del == 2)
-                {
-                        if(node->input != NULL)
-                                (*maxdirs)++;
-                        else
-                                (*maxfiles)++;
-                }
-                node = node->next;
-        }
-}
-
-struct skin* getplaylistrandom(struct skin* playlist, int maxdirs, int maxfiles)
+int getplaylistmax(struct playlist* plist)
 {
         int count = 0;
-        struct skin* node = playlist;
+        struct skin* node = plist;
+
+        while(node != NULL)
+        {
+                count++;
+                node = node->next;
+        }
+
+        return count;
+}
+
+struct playlist* getplaylistrandom(struct playlist* plist, int max)
+{
+        int count = 0;
+        struct skin* node = plist;
         
-        if(maxfiles < 1) return NULL;
+        if(max < 1) return NULL;
 
         srand(time(NULL));
-        int r = rand() % maxfiles;
+        int r = rand() % max;
         r++;
 
         while(node != NULL)
         {
-                if(node->del == 2 && node->input == NULL)
-                {
-                        count++;
-                        if(count == r) break;
-                }
+                count++;
+                if(count == r) break;
 
                 node = node->next;