Changeset 44991

Timestamp:

12/10/20 23:54:07 (2 years ago)

Author:

obi

Message:

fix

File:

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

titan/titan/player.h

@@ -35 +35 @@
 #include <sched.h>
 #include <signal.h>
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 #include <inttypes.h>
 #include <stdarg.h>
@@ -46 +46 @@
 #include <sys/resource.h>
 #include <sys/mman.h>
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -53 +53 @@
 #endif
 #include "common.h"
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 //#include "misc.h"
 #endif
@@ -64 +64 @@
 extern void      eac3_software_decoder_set(const int32_t val);
 extern void       mp3_software_decoder_set(const int32_t val);
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 extern void       amr_software_decoder_set(const int32_t val);
 extern void    vorbis_software_decoder_set(const int32_t val);
@@ -71 +71 @@
 extern void            rtmp_proto_impl_set(const int32_t val);
 extern void        flv2mpeg4_converter_set(const int32_t val);
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 extern void        sel_program_id_set(const int32_t val);
 #endif
@@ -93 +93 @@
 }
 
-//#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 static int g_pfd[2] = {-1, -1}; /* Used to wake terminate thread and kbhit */
 static int isPlaybackStarted = 0;
@@ -143 +143 @@
 }
 
-//#endif
+#endif
 
 static int HandleTracks(const Manager_t *ptrManager, const PlaybackCmd_t playbackSwitchCmd, const char *argvBuff)
@@ -163 +163 @@
             {
                 int i = 0;
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 //                E2iStartMsg();
 //                E2iSendMsg("{\"%c_%c\": [", argvBuff[0], argvBuff[1]);
@@ -174 +174 @@
                     if(0 < i)
                     {
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                         E2iSendMsg(", ");
 #else
@@ -180 +180 @@
 #endif
                     }
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 //                   E2iSendMsg("{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}", TrackList[i].Id , TrackList[i].Encoding, TrackList[i].Name);
                     fprintf(stderr, "{\"%c_%c\": [", argvBuff[0], argvBuff[1]);
@@ -196 +196 @@
             {
                 // not tracks 
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 //                E2iSendMsg("{\"%c_%c\": []}\n", argvBuff[0], argvBuff[1]);
                 fprintf(stderr, "{\"%c_%c\": []}\n", argvBuff[0], argvBuff[1]);
@@ -214 +214 @@
                 if ('a' == argvBuff[0] || 's' == argvBuff[0])
                 {
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                     E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name);
                                     fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name);
@@ -223 +223 @@
                 else // video
                 {
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                     E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d,\"an\":%d,\"ad\":%d}}\n",
                     argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name, track->width, track->height, track->frame_rate, track->progressive, track->aspect_ratio_num, track->aspect_ratio_den);
@@ -242 +242 @@
                 if ('a' == argvBuff[0] || 's' == argvBuff[0])
                 {
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                                         E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], -1, "", "");
                                     fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], -1, "", "");
@@ -251 +251 @@
                 else // video
                 {
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                                         E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d}}\n", argvBuff[0], argvBuff[1], -1, "", "", -1, -1, 0, -1);
                                     fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d}}\n", argvBuff[0], argvBuff[1], -1, "", "", -1, -1, 0, -1);
@@ -304 +304 @@
                 {
                     commandRetVal = player->playback->Command(player, playbackSwitchCmd, (void*)&id);
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
                                         E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"sts\":%d}}\n", argvBuff[0], 's', id, commandRetVal);
                                     fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"sts\":%d}}\n", argvBuff[0], 's', id, commandRetVal);
@@ -1536 +1536 @@
                 player->output->Command(player, OUTPUT_ADD, "video");
                 player->output->Command(player, OUTPUT_ADD, "subtitle");
-#ifdef OEBUILD
+#if defined(OEBUILD) || defined(SH4)
 //              int32_t* size = (int32_t*)getconfigint("playerbuffersize", NULL);
 //printf("size: %d\n", size);