Changeset 24079

Timestamp:

10/05/13 00:46:46 (10 years ago)

Author:

nit

Message:

fix

Location:

titan/titan

Files:

• play.h (modified) (2 diffs)
• player.h (modified) (4 diffs)

titan/titan/play.h

@@ -185 +185 @@
         drawscreen(playinfobarpic, 0, 0);
         drawscreen(playinfobarcover, 0, 0);
+}
+
+int checktrackname(char* text)
+{
+        int ret = -1;
+        if(text == NULL) return -1;
+        
+        ret = atoi(text);
+        if(ret == 0 && text[0] != '0') return -1;
+        
+        return ret;
 }
 
@@ -240 +251 @@
                                 tmp->type = CHOICEBOX;
                                 tmp->del = 1;
-                                if(tracklist[i] != NULL && atoi(tracklist[i]) != 0)
-                                        tmp->handle = (char*)atoi(tracklist[i]);
+                                if(checktrackname(tracklist[i]) > -1)
+                                        tmp->handle = (char*)checktrackname(tracklist[i]);
                                 else
                                         tmp->handle = (char*)(i / 2);
 
-                                if(ostrcmp(curtrackname, tracklist[i]) == 0 && ostrcmp(curtrackencoding, tracklist[i + 1]) == 0)
+                                if((ostrcmp(curtrackname, tracklist[i]) == 0 && ostrcmp(curtrackencoding, tracklist[i + 1]) == 0) || curtrackid == checktrackname(tracklist[i]))
                                 {
-                                        if(curtrackname != NULL && atoi(curtrackname) != 0)
+                                        if(checktrackname(curtrackname) > -1)
                                                 tmp->handle1 = (char*)atoi(curtrackname);
                                         else

titan/titan/player.h

@@ -1162 +1162 @@
                 
                 int i = 0;
-                while(TrackList[i] != NULL)
-                {
-                        string_newline(TrackList[i]);
-                        i += 2;
-                }
-        
                 if(TrackList != NULL)
                 {
+                        while(TrackList[i] != NULL)
+                        {
+                                string_newline(TrackList[i]);
+                                i += 2;
+                        }
+                        
                         debug(150, "Track List");
                         i = 0;
@@ -1361 +1361 @@
 #ifdef EPLAYER3
         if(player && player->playback)
-        {
-                //if(num >= 0 && num <= 9)
-                        player->playback->Command(player, PLAYBACK_SWITCH_AUDIO, (void*)&num);
-        }
+                player->playback->Command(player, PLAYBACK_SWITCH_AUDIO, (void*)&num);
 #endif
 
@@ -1377 +1374 @@
 #ifdef EPLAYER3
         if(player && player->playback)
-        {
-                //if(num >= 0 && num <= 9)
-                        player->playback->Command(player, PLAYBACK_SWITCH_SUBTITLE, (void*)&num);
-        }
+                player->playback->Command(player, PLAYBACK_SWITCH_SUBTITLE, (void*)&num);
 #endif
 }
@@ -1389 +1383 @@
         if(player && player->output && player->output->subtitle)
                 player->output->subtitle->Command(player, (OutputCmd_t)OUTPUT_STOP, NULL);
-
 #endif
 }