change internal handling of media format types and don't scan cd before opening context menu

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index ea064299..ae12c33a 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -43,8 +43,9 @@ public:
 
 typedef struct _GstElement GstElement;
 
-typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG } audiotype_t;
+typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC } audiotype_t;
 typedef enum { stPlainText, stSSA, stSRT } subtype_t;
+typedef enum { ctNone, ctMPEGTS, ctMPEGPS, ctMKV, ctAVI, ctMP4, ctVCD, ctCDA } containertype_t;
 
 class eServiceMP3: public iPlayableService, public iPauseableService, 
 	public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, public iSubtitleOutput, public Object
@@ -133,6 +134,17 @@ public:
 		{
 		}
 	};
+	struct sourceStream
+	{
+		audiotype_t audiotype;
+		containertype_t containertype;
+		bool is_video;
+		bool is_streaming;
+		sourceStream()
+			:audiotype(atUnknown), containertype(ctNone), is_video(FALSE), is_streaming(FALSE)
+		{
+		}
+	};
 private:
 	int m_currentAudioStream;
 	int m_currentSubtitleStream;