small code cleanup, fix memleaks

refs #537

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 11bf125c..01ed13a0 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -50,12 +50,6 @@ typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFL
 typedef enum { stUnknown, stPlainText, stSSA, stASS, stSRT, stVOB, stPGS } subtype_t;
 typedef enum { ctNone, ctMPEGTS, ctMPEGPS, ctMKV, ctAVI, ctMP4, ctVCD, ctCDA } containertype_t;
 
-struct SubtitlePage
-{
-	ePangoSubtitlePage *pango_page;
-	eVobSubtitlePage *vob_page;
-};
-
 class eServiceMP3: public iPlayableService, public iPauseableService,
 	public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, 
 	public iSubtitleOutput, public iStreamedService, public iAudioDelay, public Object
@@ -255,6 +249,13 @@ private:
 	GstSegment m_gst_subtitle_segment;
 	GstPadEventFunction m_gst_sink_event;
 
+	struct SubtitlePage
+	{
+		enum { Unknown, Pango, Vob } type;
+		ePangoSubtitlePage pango_page;
+		eVobSubtitlePage vob_page;
+	};
+
 	std::list<SubtitlePage> m_subtitle_pages;
 	ePtr<eTimer> m_subtitle_sync_timer;
 	ePtr<eTimer> m_subtitle_hide_timer;