libeplayer3: cleanup

libeplayer3/include/common.h

@@ -14,7 +14,5 @@ typedef struct Context_s {
     ManagerHandler_t	* manager;
 } Context_t;
 
-#ifdef MARTII
 int container_ffmpeg_update_tracks(Context_t *context, char *filename);
 #endif
-#endif

libeplayer3/include/container.h

@@ -10,17 +10,13 @@ CONTAINER_CAPABILITIES,
 CONTAINER_PLAY, 
 CONTAINER_STOP, 
 CONTAINER_SEEK, 
-#ifdef MARTII
 CONTAINER_SEEK_ABS, 
-#endif
 CONTAINER_LENGTH, 
 CONTAINER_DEL, 
 CONTAINER_SWITCH_AUDIO, 
 CONTAINER_SWITCH_SUBTITLE, 
-#ifdef MARTII
 CONTAINER_SWITCH_DVBSUBTITLE, 
 CONTAINER_SWITCH_TELETEXT, 
-#endif
 CONTAINER_INFO, 
 CONTAINER_STATUS, 
 CONTAINER_LAST_PTS, 

libeplayer3/include/manager.h

@@ -70,10 +70,8 @@ typedef struct ManagerHandler_s {
     Manager_t * audio;
     Manager_t * video;
     Manager_t * subtitle;
-#ifdef MARTII
     Manager_t * dvbsubtitle;
     Manager_t * teletext;
-#endif
 } ManagerHandler_t;
 
 void freeTrack(Track_t* track);

libeplayer3/include/output.h

@@ -61,16 +61,12 @@ typedef struct Output_s {
 
 extern Output_t LinuxDvbOutput;
 extern Output_t SubtitleOutput;
-#ifdef MARTII
 extern Output_t PipeOutput;
-#endif
 
 static Output_t * AvailableOutput[] = {
     &LinuxDvbOutput,
     &SubtitleOutput,
-#ifdef MARTII
     &PipeOutput,
-#endif
     NULL
 };
 
@@ -79,10 +75,8 @@ typedef struct OutputHandler_s {
     Output_t * audio;
     Output_t * video;
     Output_t * subtitle;
-#ifdef MARTII
     Output_t * dvbsubtitle;
     Output_t * teletext;
-#endif
     int (* Command) (/*Context_t*/void  *, OutputCmd_t, void *);
 } OutputHandler_t;
 

libeplayer3/include/pes.h

@@ -14,11 +14,7 @@
 #define PES_VERSION_FAKE_START_CODE             0x31
 
 
-#ifdef MARTII
 #define MAX_PES_PACKET_SIZE                     (65535)
-#else
-#define MAX_PES_PACKET_SIZE                     65400
-#endif
 
 
 /* start codes */

libeplayer3/include/playback.h

@@ -2,11 +2,7 @@
 #define PLAYBACK_H_
 #include <sys/types.h>
 
-#ifdef MARTII
 typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT, PLAYBACK_SWITCH_TELETEXT, PLAYBACK_SWITCH_DVBSUBTITLE, PLAYBACK_FRAMEBUFFER_LOCK, PLAYBACK_FRAMEBUFFER_UNLOCK} PlaybackCmd_t;
-#else
-typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT} PlaybackCmd_t;
-#endif
 
 typedef struct PlaybackHandler_s {
     char * Name;
@@ -31,12 +27,10 @@ typedef struct PlaybackHandler_s {
     unsigned char isVideo;
     unsigned char isAudio;
     unsigned char isSubtitle;
-#ifdef MARTII
     unsigned char isDvbSubtitle;
     unsigned char isTeletext;
     unsigned char mayWriteToFramebuffer;
     unsigned char abortRequested;
-#endif
 
     int (* Command) (/*Context_t*/void  *, PlaybackCmd_t, void *);
     char * uri;

libeplayer3/include/subtitle.h

@@ -36,10 +36,7 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
 static inline unsigned char* text_to_ass(char *text, long long int pts, double duration)
 {
      char buf[1024];
-#ifdef MARTII
-     unsigned
-#endif
-     int x,pos=0;
+     unsigned int x,pos=0;
      for(x=0;x<strlen(text);x++){
          if(text[x]=='\n'){
              buf[pos++]='\\';

libeplayer3/include/writer.h

@@ -74,10 +74,8 @@ extern Writer_t WriterVideoH263;
 extern Writer_t WriterVideoFLV;
 extern Writer_t WriterVideoVC1;
 extern Writer_t WriterFramebuffer;
-#ifdef MARTII
 extern Writer_t WriterPipe;
 extern Writer_t WriterDVBSubtitle;
-#endif
 
 static Writer_t * AvailableWriter[] = {
     &WriterAudioIPCM,