cleanup

libeplayer3/include/aac.h

@@ -26,32 +26,31 @@ static inline int aac_get_sample_rate_index(uint32_t sample_rate)
 {
     if (96000 <= sample_rate)
 	return 0;
-    else if (88200 <= sample_rate)
+    if (88200 <= sample_rate)
 	return 1;
-    else if (64000 <= sample_rate)
+    if (64000 <= sample_rate)
 	return 2;
-    else if (48000 <= sample_rate)
+    if (48000 <= sample_rate)
 	return 3;
-    else if (44100 <= sample_rate)
+    if (44100 <= sample_rate)
 	return 4;
-    else if (32000 <= sample_rate)
+    if (32000 <= sample_rate)
 	return 5;
-    else if (24000 <= sample_rate)
+    if (24000 <= sample_rate)
 	return 6;
-    else if (22050 <= sample_rate)
+    if (22050 <= sample_rate)
 	return 7;
-    else if (16000 <= sample_rate)
+    if (16000 <= sample_rate)
 	return 8;
-    else if (12000 <= sample_rate)
+    if (12000 <= sample_rate)
 	return 9;
-    else if (11025 <= sample_rate)
+    if (11025 <= sample_rate)
 	return 10;
-    else if (8000 <= sample_rate)
+    if (8000 <= sample_rate)
 	return 11;
-    else if (7350 <= sample_rate)
+    if (7350 <= sample_rate)
 	return 12;
-    else
-	return 13;
+    return 13;
 }
 
 #endif

libeplayer3/include/misc.h

@@ -21,10 +21,6 @@ typedef struct BitPacker_s {
 
 #define INVALID_PTS_VALUE                       0x200000000ull
 
-/* subtitle hacks ->for file subtitles */
-#define TEXTSRTOFFSET 100
-#define TEXTSSAOFFSET 200
-
 /* ***************************** */
 /* Prototypes                    */
 /* ***************************** */

libeplayer3/include/output.h

@@ -25,11 +25,6 @@ typedef enum {
     OUTPUT_REVERSE,
     OUTPUT_DISCONTINUITY_REVERSE,
     OUTPUT_GET_FRAME_COUNT,
-/* fixme: e2 */
-    OUTPUT_SUBTITLE_REGISTER_FUNCTION = 222,
-    OUTPUT_SUBTITLE_REGISTER_BUFFER = 223,
-    OUTPUT_GET_SUBTITLE_OUTPUT,
-    OUTPUT_SET_SUBTITLE_OUTPUT
 } OutputCmd_t;
 
 typedef struct {

libeplayer3/include/playback.h

@@ -8,9 +8,7 @@ typedef enum { PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP,
     PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO,
     PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_METADATA, PLAYBACK_SLOWMOTION,
     PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT,
-    PLAYBACK_SWITCH_TELETEXT, PLAYBACK_SWITCH_DVBSUBTITLE,
-    PLAYBACK_FRAMEBUFFER_LOCK,
-    PLAYBACK_FRAMEBUFFER_UNLOCK
+    PLAYBACK_SWITCH_TELETEXT
 } PlaybackCmd_t;
 
 typedef struct PlaybackHandler_s {
@@ -37,7 +35,6 @@ typedef struct PlaybackHandler_s {
     unsigned char isSubtitle;
     unsigned char isDvbSubtitle;
     unsigned char isTeletext;
-    unsigned char mayWriteToFramebuffer;
     unsigned char abortRequested;
     unsigned char abortPlayback;
 

libeplayer3/include/writer.h

@@ -58,12 +58,10 @@ extern Writer_t WriterVideoH263;
 extern Writer_t WriterVideoFLV;
 extern Writer_t WriterVideoVC1;
 extern Writer_t WriterPipe;
-extern Writer_t WriterDVBSubtitle;
 
 Writer_t *getWriter(char *encoding);
 
 Writer_t *getDefaultVideoWriter();
 Writer_t *getDefaultAudioWriter();
-Writer_t *getDefaultFramebufferWriter();
 
 #endif