Changeset 17015

Timestamp:

07/07/12 19:29:21 (12 years ago)

Author:

nit

Message:

[titan] add playfile support to dvdplayer

File:

• titan/plugins/dvdplayer/dvdplay.h (modified) (8 diffs)

titan/plugins/dvdplayer/dvdplay.h

@@ -4 +4 @@
 extern struct skin* skin;
 
-void screendvdplay(char* file, int flag)
+void screendvdplay(char* startfile, int flag)
 {
 printf("file1: %s\n",file);
         int rcret = 0, playertype = 2, dirrcret = 0;
-        char* tmpstr = NULL, *startdir = NULL, *tmppolicy = NULL;
+        char* tmpstr = NULL, *startdir = NULL;
+        char* file = NULL, *tmppolicy = NULL;
         struct skin* playinfobar = getscreen("playinfobar");
 
@@ -26 +27 @@
         int playinfobarcount = 0, playinfobarstatus = 0;
 printf("file3: %s\n",file);
-        if(file == NULL)
+        if(startfile == NULL)
         {
 printf("file4: %s\n",file);
@@ -33 +34 @@
                 free(tmpstr); tmpstr = NULL;
         }
+        else
+                file = ostrcat(startfile, NULL, 0, 0);
         
-        if(dirrcret == 1)
+        if(startfile == NULL && dirrcret == 1)
         {
                 system("umount /media/dvd");
@@ -47 +50 @@
                 free(tmpstr); tmpstr = NULL;
                 
-                rcret = servicestop(status.aktservice, 1, 1);
-                if(rcret == 1)
+                if(startfile == NULL)
                 {
-                        free(tmppolicy);
-                        free(file);
-                        return;
+                        rcret = servicestop(status.aktservice, 1, 1);
+                        if(rcret == 1)
+                        {
+                                free(tmppolicy);
+                                free(file);
+                                return;
+                        }
                 }
+                else
+                        goto playerend;
 
                 drawscreen(skin, 0, 0);
@@ -65 +73 @@
                         writevfd("DVD");
                         
-                        playstartservice();
-                        goto playerstart;
+                        if(startfile == NULL)
+                        {
+                                playstartservice();
+                                goto playerstart;
+                        }
                 }
 #endif
@@ -100 +111 @@
                                 {
                                         playrcstop(playertype, flag);
-                                        playstartservice();
-                                        goto playerstart;
+                                        if(startfile == NULL)
+                                        {
+                                                playstartservice();
+                                                goto playerstart;
+                                        }
+                                        else
+                                                goto playerend;
                                 }
 
@@ -167 +183 @@
                         //the player stops to fast, and a last seek can
                         //produce a segfault
+playerend:
                         sleep(1);
                         dvdafterend();
@@ -173 +190 @@
                         screenplayinfobar(file, 1, playertype, flag);
 
-                        playstartservice();
-                        goto playerstart;
+                        if(startfile == NULL)
+                        {
+                                playstartservice();
+                                goto playerstart;
+                        }
+                        else
+                                break;
                 }
         }