Changeset 39693

Timestamp:

01/07/17 22:48:31 (6 years ago)

Author:

obi

Message:

enable exteplayer3

Location:

titan/titan

Files:

• player.h (modified) (4 diffs)
• struct.h (modified) (1 diff)

titan/titan/player.h

@@ -1020 +1020 @@
                 player->output->Command(player, OUTPUT_ADD, "video");
                 player->output->Command(player, OUTPUT_ADD, "subtitle");
-                
+#ifndef BETA
                 //for subtitle
                 SubtitleOutputDef_t subout;
@@ -1033 +1033 @@
 
                 player->output->subtitle->Command(player, (OutputCmd_t)OUTPUT_SET_SUBTITLE_OUTPUT, (void*)&subout);
-                
+#endif          
                 if(player->playback->Command(player, PLAYBACK_OPEN, tmpfile) < 0)
                 {
@@ -2610 +2610 @@
         if(player && player->output && player->output->subtitle)
                 player->output->subtitle->Command(player, (OutputCmd_t)OUTPUT_STOP, NULL);
+#ifndef BETA
         if(player && player->container && player->container->assContainer)
         {
@@ -2620 +2621 @@
                 player->manager->subtitle->Command(player, MANAGER_DEL, (void*)&onlycurrent);
         }
+#endif
 #endif
 

titan/titan/struct.h

@@ -105 +105 @@
 #ifdef EPLAYER3
 #include <common.h>
+#ifndef BETA
 #include <subtitle.h>
+#endif
 #endif