Changeset 40409 for titan/titan/player.h

Timestamp:

05/11/17 20:06:01 (6 years ago)

Author:

obi

Message:

test exteplayer3 on nightly

File:

• titan/titan/player.h (modified) (15 diffs)

titan/titan/player.h

@@ -27 +27 @@
 extern ManagerHandler_t ManagerHandler;
 
-#ifdef BETA
+#ifdef EXTEPLAYER3
 #include <stdlib.h>
 #include <stdio.h>
@@ -1194 +1194 @@
                 player->manager = &ManagerHandler;
 
-//#ifndef BETA          
+//#ifndef EXTEPLAYER3           
                 //add container befor open, so we can set buffer size
                 char* extffm = getfilenameext(tmpfile);
@@ -1210 +1210 @@
                 if(player && player->container && player->container->selectedContainer)
                 {
-#ifndef BETA
+#ifndef EXTEPLAYER3
                         int32_t size = getconfigint("playerbuffersize", NULL);
                         int32_t seektime = getconfigint("playerbufferseektime", NULL);
@@ -1234 +1234 @@
                 
                 debug(150, "eplayername = %s", player->output->Name);
-#ifdef BETA
+#ifdef EXTEPLAYER3
             // make sure to kill myself when parent dies
             prctl(PR_SET_PDEATHSIG, SIGKILL);
@@ -1244 +1244 @@
                 player->output->Command(player, OUTPUT_ADD, "video");
                 player->output->Command(player, OUTPUT_ADD, "subtitle");
-#ifndef BETA
+#ifndef EXTEPLAYER3
                 //for subtitle
 //              SubtitleOutputDef_t subout;
@@ -2153 +2153 @@
 #ifdef EPLAYER3
         int speedmap = 0;
-#ifdef BETA
+#ifdef EXTEPLAYER3
         if (speed < 2) speed = 2;
         if (speed > 8) speed = 8;
@@ -2260 +2260 @@
 {
 #ifdef EPLAYER3
-#ifdef BETA
+#ifdef EXTEPLAYER3
         int64_t sectmp = (int64_t)sec;
         if(player && player->playback)  
@@ -2426 +2426 @@
 char** playergettracklist(int type)
 {
-#ifdef BETA
+#ifdef EXTEPLAYER3
 #ifdef EPLAYER3
         TrackDescription_t *TrackList = NULL;
@@ -2464 +2464 @@
                 }
 
-#ifdef BETA
+#ifdef EXTEPLAYER3
                 TrackList2 = calloc(1, sizeof(char *) * ((100 * 2) + 1));
 
@@ -2705 +2705 @@
 //////////////////////////////NEUER CODE //////////////////////////////
 
-#ifdef BETA
+#ifdef EXTEPLAYER3
 #ifdef EPLAYER3
         return TrackList2;
@@ -2803 +2803 @@
 unsigned long long playergetpts()
 {
-#ifdef BETA
+#ifdef EXTEPLAYER3
 #ifdef EPLAYER3
         int64_t pts = 0;
@@ -2821 +2821 @@
                 player->playback->Command(player, PLAYBACK_PTS, &pts);
                 sec = pts / 90000;
-#ifdef BETA
+#ifdef EXTEPLAYER3
                 debug(150, "Pts = %02d:%02d:%02d (%lld sec)", (int)((sec / 60) / 60) % 60, (int)(sec / 60) % 60, (int)sec % 60, sec);
 #else
@@ -2906 +2906 @@
 double playergetlength()
 {
-#ifdef BETA
+#ifdef EXTEPLAYER3
 #ifdef EPLAYER3
         int64_t length = 0;
@@ -2921 +2921 @@
                 player->playback->Command(player, PLAYBACK_LENGTH, &length);
                 if(length < 0) length = 0;
-#ifdef BETA
+#ifdef EXTEPLAYER3
                 debug(150, "Length = %02d:%02d:%02d (%lld sec)", (int)((length / 60) / 60) % 60, (int)(length / 60) % 60, (int)length % 60, length);
 #else
@@ -3010 +3010 @@
         if(player && player->output && player->output->subtitle)
                 player->output->subtitle->Command(player, (OutputCmd_t)OUTPUT_STOP, NULL);
-#ifndef BETA
+#ifndef EXTEPLAYER3
         if(player && player->container && player->container->assContainer)
         {