libeplayer3/playback_libeplayer3: change noprobe handling

Origin commit data
------------------
Branch: master
Commit: 5548017dc7
Author: martii <m4rtii@gmx.de>
Date: 2013-03-18 (Mon, 18 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

libeplayer3/container/container_ffmpeg.c

@@ -1604,10 +1604,8 @@ int container_ffmpeg_init(Context_t *context, char * filename)
     }
 
     avContext->flags = AVFMT_FLAG_GENPTS;
-#ifndef MARTII // I'm currently taking the DVB subtitle info from the stream. Need to probe.
     if (context->playback->noprobe)
         avContext->max_analyze_duration = 1;
-#endif
 
     ffmpeg_printf(20, "find_streaminfo\n");
 

libspark/playback_libeplayer3.cpp

@@ -106,7 +106,11 @@ void cPlayback::Close(void)
 }
 
 //Used by Fileplay
+#ifdef MARTII
+bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int, bool no_probe)
+#else
 bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int)
+#endif
 {
 	bool ret = false;
 	bool isHTTP = false;
@@ -150,7 +154,11 @@ bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned s
 	    printf("upnp://\n");
             isHTTP = true;
 	}
+#ifdef MARTII
+	else if (pm == PLAYMODE_TS && no_probe)
+#else
 	else if (pm == PLAYMODE_TS)
+#endif
 	    strcat(file, "myts://");
 	else
 	    strcat(file, "file://");

libspark/playback_libeplayer3.h

@@ -33,7 +33,11 @@ class cPlayback
 		bool Open(playmode_t PlayMode);
 		void Close(void);
 		bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid,
+#ifdef MARTII
+			   int ac3, unsigned int duration, bool no_probe = true);
+#else
 			   int ac3, unsigned int duration);
+#endif
 		bool SetAPid(unsigned short pid, bool ac3);
 #ifdef MARTII
 		bool SetSubtitlePid(unsigned short pid);