[matroska] r835 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-09-23 19:06:15 +0400 (Thu, 23 Sep 2004)
New Revision: 835

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/VobParser.cpp
   trunk/DvdMenuXtractor/VobParser.h
Log:
cosmetic changes

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-23 14:54:29 UTC (rev 834)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-23 15:06:15 UTC (rev 835)
@@ -1060,7 +1060,7 @@
 		CellListElem* cle;
 		CellsListType::Node *node;
 		const CellsListType *CellsList = IfoFile->GetCellsList();
-		CellMap& cell_map = m_VobParser->GetVobMap();
+//		CellMap& cell_map = m_VobParser->GetVobMap();
 		cell_info_node* cin;
 
 		static unsigned char _PrivateFP[]  = {0x30, 0x00, 0x00, 0x00};

Modified: trunk/DvdMenuXtractor/VobParser.cpp
===================================================================
--- trunk/DvdMenuXtractor/VobParser.cpp	2004-09-23 14:54:29 UTC (rev 834)
+++ trunk/DvdMenuXtractor/VobParser.cpp	2004-09-23 15:06:15 UTC (rev 835)
@@ -104,21 +104,21 @@
 
 // ----------------------------------------------------------------------------
 
-uint32_t VobParser::GetPacketCount()
+uint32_t VobParser::GetPacketCount() const
 {
 	return m_pktcount;
 }
 
 // ----------------------------------------------------------------------------
 
-uint32_t VobParser::GetPacketIndex()
+uint32_t VobParser::GetPacketIndex() const
 {
 	return m_pktindex;
 }
 
 // ----------------------------------------------------------------------------
 
-char* VobParser::GetCurrentPacketData()
+char* VobParser::GetCurrentPacketData() const
 {
 	return (char*)m_buff;
 }
@@ -204,7 +204,7 @@
 
 // ----------------------------------------------------------------------------
 
-bool VobParser::AvailablePacketData()
+bool VobParser::AvailablePacketData() const
 {
 	return (m_index < PACKET_SIZE);
 }
@@ -262,7 +262,7 @@
 void VobParser::ParseSCR()
 {
 
-/* From http://members.aol.com/mpucoder/DVD/packhdr.html
+/* From http://dvd.sourceforge.net/dvdinfo/packhdr.html
 
 	      Byte 4                      Byte 5
 	      +--+--+--+--+--+--+--+--+   +--+--+--+--+--+--+--+--+
@@ -693,21 +693,21 @@
 
 // ----------------------------------------------------------------------------
 
-uint8_t VobParser::GetVobID()
+uint8_t VobParser::GetVobID() const
 {
 	return m_dsi.vobu_vob_idn;
 }
 
 // ----------------------------------------------------------------------------
 
-uint8_t VobParser::GetCellID()
+uint8_t VobParser::GetCellID() const
 {
 	return m_dsi.vobu_c_idn;
 }
 
 // ----------------------------------------------------------------------------
  
-CellMap& VobParser::GetVobMap()
+const CellMap& VobParser::GetVobMap() const
 {
 	return m_map;
 }

Modified: trunk/DvdMenuXtractor/VobParser.h
===================================================================
--- trunk/DvdMenuXtractor/VobParser.h	2004-09-23 14:54:29 UTC (rev 834)
+++ trunk/DvdMenuXtractor/VobParser.h	2004-09-23 15:06:15 UTC (rev 835)
@@ -521,15 +521,15 @@
 	VobParser(const char* filename);
 	void Reset();
 	bool ParseNextPacket();
-	uint32_t GetPacketCount();
-	uint32_t GetPacketIndex();
-	char* GetCurrentPacketData();
-	uint8_t GetVobID();
-	uint8_t GetCellID();
+	uint32_t GetPacketCount() const;
+	uint32_t GetPacketIndex() const;
+	char* GetCurrentPacketData() const;
+	uint8_t GetVobID() const;
+	uint8_t GetCellID() const;
 	void SetDemuxer(Demuxer* demuxer);
 	bool IsNewCell();
 	void BuildMap();
-	CellMap& GetVobMap();
+	const CellMap& GetVobMap() const;
 	virtual ~VobParser();
 
 	nav_dsi_gi m_dsi;
@@ -550,7 +550,7 @@
 	uint64_t ParsePTS_DTS();
 
 	// Buffer management
-	bool AvailablePacketData();
+	bool AvailablePacketData() const;
 	bool GetNextPacket();
 	uint32_t GetNext32Bits();
 	uint16_t GetNext16Bits();