[matroska] r1026 - in trunk/DvdMenuXtractor: . iso

Author: robux4
Date: 2005-01-10 18:15:50 +0300 (Mon, 10 Jan 2005)
New Revision: 1026

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/DvdMenuXtractor.h
   trunk/DvdMenuXtractor/IFOFile.cpp
   trunk/DvdMenuXtractor/MyWizard.h
   trunk/DvdMenuXtractor/SUBDecoder.cpp
   trunk/DvdMenuXtractor/VobParser.cpp
   trunk/DvdMenuXtractor/VobParser.h
   trunk/DvdMenuXtractor/iso/iso_lang.h
Log:
DMX: fixes to build on Linux

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-01-10 15:15:50 UTC (rev 1026)
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 #include "IFOFile.h"
-#include "VOBParser.h"
+#include "VobParser.h"
 #include "SUBDecoder.h"
 #include "base64.h"
 #include "iso/iso_lang.h"
@@ -269,7 +269,7 @@
 		wxFileName _DirName(m_edOutDir->GetValue());
 		if (!_DirName.DirExists())
 		{
-			wxLogError("Cannot use output directory '%s'", _DirName.GetPath(wxPATH_GET_VOLUME));
+			wxLogError("Cannot use output directory '%s'", _DirName.GetPath(wxPATH_GET_VOLUME).c_str());
 			return false;
 		}
 		else
@@ -1111,7 +1111,7 @@
 		else
 		{
 			nano_duration = still_time;
-			nano_duration *= 1000000000.0;
+			nano_duration = uint64_t(double(nano_duration) * 1000000000.0);
 		}
 		
 		return nano_duration;

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.h
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.h	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.h	2005-01-10 15:15:50 UTC (rev 1026)
@@ -12,4 +12,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif

Modified: trunk/DvdMenuXtractor/IFOFile.cpp
===================================================================
--- trunk/DvdMenuXtractor/IFOFile.cpp	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/IFOFile.cpp	2005-01-10 15:15:50 UTC (rev 1026)
@@ -653,4 +653,4 @@
 			timecode += cell->duration;
 		node = node->GetNext();
 	}
-}
\ No newline at end of file
+}

Modified: trunk/DvdMenuXtractor/MyWizard.h
===================================================================
--- trunk/DvdMenuXtractor/MyWizard.h	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/MyWizard.h	2005-01-10 15:15:50 UTC (rev 1026)
@@ -3,11 +3,12 @@
 #define __MY_WX_WIZARD__
 // ----------------------------------------------------------------------------
 
+#include <wx/config.h>
 #include <wx/button.h>
-#include <wx/config.h>
 #include <wx/dialog.h>
 #include <wx/stattext.h>
 #include <wx/statbmp.h>
+#include <wx/panel.h>
 
 class wxMyWizard;
 

Modified: trunk/DvdMenuXtractor/SUBDecoder.cpp
===================================================================
--- trunk/DvdMenuXtractor/SUBDecoder.cpp	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/SUBDecoder.cpp	2005-01-10 15:15:50 UTC (rev 1026)
@@ -70,4 +70,4 @@
 	spudec_free(m_spudec_handle);
 }
 
-// ----------------------------------------------------------------------------
\ No newline at end of file
+// ----------------------------------------------------------------------------

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2005-01-10 15:15:50 UTC (rev 1026)
@@ -87,7 +87,7 @@
 	return true;
 }
 
-void CompositeDemuxWriter::ProcessStream(uint8_t 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, wxString & debug)
 {
 	if (m_muxers[streamID] != NULL)
 		m_muxers[streamID]->ProcessStream(buff, size, start_time, end_time, debug);
@@ -208,7 +208,7 @@
 		SkipNBytes(stuffing_nb);
 		
 		uint32_t _Header = GetNext32Bits();
-		uint8_t _StreamID;
+		int _StreamID;
 		if ((_Header & VOB_SLICE) == VOB_SLICE)
 		{
 			_StreamID = _Header & 0xFF;
@@ -666,7 +666,7 @@
 		length - 3 - pes_header_data_content.PES_header_data_len, pktinfo.pts/90, pktinfo.dts/90, wxString::Format("DTS %d PTS %d - %d %d\n", m_startdts/90, m_startpts/90, pktinfo.dts/90, pktinfo.pts/90));
 }
 
-void VobParser::ParseAudioPacket(uint8_t StreamID)
+void VobParser::ParseAudioPacket(int StreamID)
 {
 	uint16_t length = GetNext16Bits();
 	ParsePESHeaderDataContentFlag();
@@ -787,6 +787,8 @@
  
 void SubDemuxWriter::WriteTimecodeInfo(uint32_t start_time, uint32_t end_time, uint64_t filepos, wxString & debug)
 {
+	int i;
+
 	if (!m_TimecodeFile)
 	{
 		wxString m_filename = m_Filename;
@@ -814,7 +816,7 @@
                "forced subs: OFF\n\n"
                "# The original palette of the DVD\n"
 			   "palette: ", 1, 692, m_TimecodeFile);
-		for (int i=0; i<15; i++)
+		for (i=0; i<15; i++)
 		{
 			fprintf(m_TimecodeFile, "%06x, ", m_palette[i]);
 		}

Modified: trunk/DvdMenuXtractor/VobParser.h
===================================================================
--- trunk/DvdMenuXtractor/VobParser.h	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/VobParser.h	2005-01-10 15:15:50 UTC (rev 1026)
@@ -497,7 +497,7 @@
 	CompositeDemuxWriter();
 	~CompositeDemuxWriter();
 	bool AddDemuxer(uint8_t streamID, Writer * demuxer, wxString & CommandLine);
-	void ProcessStream(uint8_t 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, wxString & debug);
 	void Reset();
 	void SetBoundary(uint32_t start_timecode, uint32_t duration, const CellListElem *cell);
 
@@ -570,7 +570,7 @@
 	PES_header_data_content pes_header_data_content;
 protected:
 	void ParseNavPacket();
-	void ParseAudioPacket(uint8_t StreamID);
+	void ParseAudioPacket(int StreamID);
 	void ParseVideoPacket();
 	void ParsePrivateStream1();
 

Modified: trunk/DvdMenuXtractor/iso/iso_lang.h
===================================================================
--- trunk/DvdMenuXtractor/iso/iso_lang.h	2005-01-09 16:00:02 UTC (rev 1025)
+++ trunk/DvdMenuXtractor/iso/iso_lang.h	2005-01-10 15:15:50 UTC (rev 1026)
@@ -48,4 +48,4 @@
 #ifdef __cplusplus
 };
 #endif
-#endif // _ISO_LANG_H_
\ No newline at end of file
+#endif // _ISO_LANG_H_