[matroska] r1027 - trunk/DvdMenuXtractor

[email protected]
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]> 
Author: robux4
Date: 2005-01-10 18:30:42 +0300 (Mon, 10 Jan 2005)
New Revision: 1027

Modified:
   trunk/DvdMenuXtractor/MyWizard.h
   trunk/DvdMenuXtractor/VobParser.cpp
   trunk/DvdMenuXtractor/VobParser.h
Log:
DMX: more gcc fixes

Modified: trunk/DvdMenuXtractor/MyWizard.h
===================================================================
--- trunk/DvdMenuXtractor/MyWizard.h	2005-01-10 15:15:50 UTC (rev 1026)
+++ trunk/DvdMenuXtractor/MyWizard.h	2005-01-10 15:30:42 UTC (rev 1027)
@@ -187,4 +187,4 @@
 
 // ----------------------------------------------------------------------------
 #endif
-// ----------------------------------------------------------------------------
\ No newline at end of file
+// ----------------------------------------------------------------------------

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2005-01-10 15:15:50 UTC (rev 1026)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2005-01-10 15:30:42 UTC (rev 1027)
@@ -87,7 +87,7 @@
 	return true;
 }
 
-void CompositeDemuxWriter::ProcessStream(int streamID, uint8_t* buff, uint32_t size, int32_t start_time, int32_t end_time, wxString & debug)
+void CompositeDemuxWriter::ProcessStream(int streamID, uint8_t* buff, uint32_t size, int32_t start_time, int32_t end_time, const wxString & debug)
 {
 	if (m_muxers[streamID] != NULL)
 		m_muxers[streamID]->ProcessStream(buff, size, start_time, end_time, debug);
@@ -255,7 +255,8 @@
 				{ // there are some buttons
 					uint32_t t3 = m_pci.vobu_s_ptm/90 - m_pci_vob_timecode_offset;
 					uint32_t t4 = m_pci.vobu_e_ptm/90 - m_pci_vob_timecode_offset;
-					m_demuxer.ProcessStream(SUBSTREAM_PCI, &m_buff[m_pci_position], m_pci_size+2, t3, t4, wxString::Format("# %d -> %d / %X / %X / %d / %d / off %d\n", m_pci.vobu_s_ptm/90, m_pci.vobu_e_ptm/90, m_dsi.c_eltm, m_pci.c_eltm, t3, t4, m_pci_vob_timecode_offset));
+					m_demuxer.ProcessStream(SUBSTREAM_PCI, &m_buff[m_pci_position], m_pci_size+2, t3, t4, 
+					    wxString::Format("# %d -> %d / %X / %X / %d / %d / off %d\n", m_pci.vobu_s_ptm/90, m_pci.vobu_e_ptm/90, m_dsi.c_eltm, m_pci.c_eltm, t3, t4, m_pci_vob_timecode_offset));
 				}
 			}
 			else if ((_StreamID & VIDEO_STREAM) == VIDEO_STREAM)
@@ -694,7 +695,8 @@
 		DebugLog("Subtitles streamID = 0x%X\n", substreamID);
 
 		// .sub files the VobSub way (includes the whole packet)
-		m_demuxer.ProcessStream(substreamID, m_buff, DVD_VIDEO_LB_LEN, t3, t4, wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
+		m_demuxer.ProcessStream(substreamID, m_buff, DVD_VIDEO_LB_LEN, t3, t4, 
+		     wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
 	}
 	else if(substreamID >= SUBSTREAM_AC3_LOW && substreamID < SUBSTREAM_AC3_HIGH)
 	{
@@ -705,7 +707,8 @@
 		SkipNBytes(2);
 
 		uint16_t ac3DataLen = length - (m_index - dataStartIndex);
-		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
+		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, 
+		    wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
 	}
 	else if(substreamID >= SUBSTREAM_DTS_LOW && substreamID < SUBSTREAM_DTS_HIGH)
 	{
@@ -716,7 +719,8 @@
 		SkipNBytes(2);
 
 		uint16_t ac3DataLen = length - (m_index - dataStartIndex);
-		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
+		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, 
+		    wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
 	}
 	else if(substreamID >= SUBSTREAM_PCM_LOW && substreamID < SUBSTREAM_PCM_HIGH)
 	{
@@ -725,7 +729,8 @@
 		SkipNBytes(6);
 
 		uint16_t ac3DataLen = length - (m_index - dataStartIndex);
-		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
+		m_demuxer.ProcessStream(substreamID, &m_buff[m_index], ac3DataLen, t3, t4, 
+		    wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
 	}
 	else
 	{
@@ -785,7 +790,7 @@
 
 // ----------------------------------------------------------------------------
  
-void SubDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void SubDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 	int i;
 
@@ -845,7 +850,7 @@
 	fprintf(m_TimecodeFile, "timestamp: %02d:%02d:%02d:%03d, filepos: %09x\n", delay,minute,second,millisecond,filepos);
 }
 
-void BtnDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void BtnDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 //static uint32_t time =0;
 	m_TimecodeFile = GetTimecodeFile();
@@ -864,7 +869,7 @@
 	m_last_end_timecode = end_time;
 }
 
-void DTSDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void DTSDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 	m_TimecodeFile = GetTimecodeFile();
 	if (start_time > m_last_end_timecode)
@@ -879,7 +884,7 @@
 	m_last_end_timecode = end_time;
 }
 
-void LPCMDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void LPCMDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 	m_TimecodeFile = GetTimecodeFile();
 	if (start_time > m_last_end_timecode)
@@ -894,12 +899,12 @@
 	m_last_end_timecode = end_time;
 }
 
-void MPADemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void MPADemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 	m_TimecodeFile = GetTimecodeFile();
 }
 
-void AC3DemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void AC3DemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 	m_TimecodeFile = GetTimecodeFile();
 	if (start_time > m_last_end_timecode)
@@ -914,7 +919,7 @@
 	m_last_end_timecode = end_time;
 }
 
-void VideoDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
+void VideoDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug)
 {
 }
 
@@ -1162,7 +1167,7 @@
 	}
 }
 
-void WavWriter::Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+void WavWriter::Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 {
 	if (m_bit_depth != 16) // not supported
 		return;

Modified: trunk/DvdMenuXtractor/VobParser.h
===================================================================
--- trunk/DvdMenuXtractor/VobParser.h	2005-01-10 15:15:50 UTC (rev 1026)
+++ trunk/DvdMenuXtractor/VobParser.h	2005-01-10 15:30:42 UTC (rev 1027)
@@ -193,7 +193,7 @@
 {
 public:
 	virtual ~Demuxer() {}
-	virtual void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug) = 0;
+	virtual void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug) = 0;
 	virtual void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell) = 0;
 };
 
@@ -221,7 +221,7 @@
 			fclose(m_TimecodeFile);
 	}
 
-	virtual void Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	virtual void Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		m_file = OpenOuputFile();
 		WriteTimecodeInfo(start_time, end_time, ftell(m_file), debug);
@@ -266,7 +266,7 @@
 	FILE* m_TimecodeFile;
 	double m_fps;
 
-	virtual void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug) = 0;
+	virtual void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug) = 0;
 };
 
 // ----------------------------------------------------------------------------
@@ -281,11 +281,11 @@
 		,m_last_end_timecode(0)
 		,m_is_still(false)
 	{}
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug) { Write(buff, size, start_time, end_time, debug); }
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug) { Write(buff, size, start_time, end_time, debug); }
 	void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell);
 	~VideoDemuxWriter();
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 	uint32_t m_start_timecode;
 	uint32_t m_end_timecode;
 	uint32_t m_last_start_timecode;
@@ -306,7 +306,7 @@
 		,m_last_end_timecode(0)
 	{}
 	~AC3DemuxWriter();
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		Write(buff,size, start_time, end_time, debug);
 	}
@@ -314,7 +314,7 @@
 private:
 	uint8_t m_streamID;
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 	uint32_t m_start_timecode;
 	uint32_t m_end_timecode;
 	uint32_t m_last_start_timecode;
@@ -334,7 +334,7 @@
 		,m_last_end_timecode(0)
 	{}
 	~DTSDemuxWriter();
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		Write(buff,size, start_time, end_time, debug);
 	}
@@ -342,7 +342,7 @@
 private:
 	uint8_t m_streamID;
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 	uint32_t m_start_timecode;
 	uint32_t m_end_timecode;
 	uint32_t m_last_start_timecode;
@@ -361,7 +361,7 @@
 			,m_channel_nb(channel_nb)
 		{}
 		~WavWriter();
-		void Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug);
+		void Write(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug);
 	protected:
 		uint32_t m_sample_rate;
 		uint8_t m_bit_depth, m_channel_nb;
@@ -379,7 +379,7 @@
 		,m_last_end_timecode(0)
 	{}
 	~LPCMDemuxWriter();
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		Write(buff,size, start_time, end_time, debug);
 	}
@@ -387,7 +387,7 @@
 private:
 	uint8_t m_streamID;
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 	uint32_t m_start_timecode;
 	uint32_t m_end_timecode;
 	uint32_t m_last_start_timecode;
@@ -401,7 +401,7 @@
 public:
 	MPADemuxWriter(const char* filenamePrefix, const uint8_t streamID) :
 	  Writer(filenamePrefix,"mpa",0.0), m_streamID(streamID) {}
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		Write(buff,size, start_time, end_time, debug);
 	}
@@ -409,7 +409,7 @@
 private:
 	uint8_t m_streamID;
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 };
 
 // ----------------------------------------------------------------------------
@@ -427,13 +427,13 @@
 		,m_start_timecode(0)
 		,m_end_timecode(0)
 	{}
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		Write(buff,size, start_time, end_time, debug);
 	}
 	void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell);
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 private:
 	uint16_t m_width;
 	uint16_t m_height;
@@ -457,7 +457,7 @@
 		,m_last_start_timecode(0)
 		,m_last_end_timecode(0)
 	{}
-	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, wxString & debug)
+	void ProcessStream(uint8_t* buff, uint32_t size, uint32_t start_time, uint32_t end_time, const wxString & debug)
 	{
 		if (!m_file) {
 			m_file = OpenOuputFile();
@@ -481,7 +481,7 @@
 	void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell);
 	~BtnDemuxWriter();
 protected:
-	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug);
+	void WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, const wxString & debug);
 	uint16_t m_width, m_height;
 	uint32_t m_start_timecode;
 	uint32_t m_end_timecode;
@@ -497,7 +497,7 @@
 	CompositeDemuxWriter();
 	~CompositeDemuxWriter();
 	bool AddDemuxer(uint8_t streamID, Writer * demuxer, wxString & CommandLine);
-	void ProcessStream(int streamID, uint8_t* buff, uint32_t size, int32_t start_time, int32_t end_time, wxString & debug);
+	void ProcessStream(int streamID, uint8_t* buff, uint32_t size, int32_t start_time, int32_t end_time, const wxString & debug);
 	void Reset();
 	void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell);
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.