Merge remote-tracking branch 'robux4/removals'

Matroska-Org · Mar 2, 2024 · 9f27b2d · 9f27b2d
2 parents 42b44fa + 471da3a
commit 9f27b2d
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 134 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,6 @@ if(DEV_MODE)
 endif()
 
 set(libmatroska_SOURCES
-  src/FileKax.cpp
   src/KaxAttached.cpp
   src/KaxAttachments.cpp
   src/KaxBlock.cpp
@@ -57,7 +56,6 @@ set(libmatroska_SOURCES
   src/KaxVersion.cpp)
 
 set(libmatroska_PUBLIC_HEADERS
-  matroska/FileKax.h
   matroska/KaxBlockData.h
   matroska/KaxBlock.h
   matroska/KaxCluster.h

diff --git a/matroska/FileKax.h b/matroska/FileKax.h
diff --git a/matroska/KaxTypes.h b/matroska/KaxTypes.h
@@ -8,7 +8,6 @@
 #define LIBMATROSKA_TYPES_H
 
 #include "matroska/KaxConfig.h"
-#include <ebml/EbmlTypes.h>
 
 /*!
     \enum track_type
@@ -25,43 +24,6 @@ typedef enum track_type {
     track_control     = 0x20  ///< Control-codes for menus and other stuff
 } track_type;
 
-/*!
-    \enum matroska_error_t
-    \brief a callback that the library use to inform of errors happening
-    \note this should be used by the libmatroska internals
-*/
-typedef enum {
-  error_null_pointer  ///< NULL pointer where something else is expected
-} matroska_error_t;
-
-typedef void *matroska_stream;
-
-/*!
-    \var void* matroska_id
-    \brief UID used to access an Matroska file instance
-*/
-typedef void* matroska_id;
-/*!
-    \var void* matroska_track
-    \brief UID used to access a track
-*/
-typedef void* matroska_track;
-/*!
-    \var char* c_string
-    \brief C-String, ie a buffer with characters terminated by \0
-*/
-typedef char* c_string;
-/*!
-    \var unsigned int matroska_file_mode
-    \brief A bit buffer, each bit representing a value for the file opening
-    \todo replace the unsigned int by a sized type (8 or 16 bits)
-*/
-typedef char * matroska_file_mode;
-/*!
-    \var void (*matroska_error_callback)(matroska_error_t error_code, char* error_message)
-    \brief a callback that the library use to inform of errors happening
-*/
-typedef void (*matroska_error_callback)(matroska_error_t error_code, char* error_message);
 
 namespace libmatroska {
 

diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h
@@ -18,7 +18,6 @@ namespace libmatroska {
 #define LIBMATROSKA_VERSION 0x020000
 
 extern const MATROSKA_DLL_API std::string KaxCodeVersion;
-extern const MATROSKA_DLL_API std::string KaxCodeDate;
 
 /*!
   \todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading

diff --git a/src/FileKax.cpp b/src/FileKax.cpp
diff --git a/src/KaxVersion.cpp b/src/KaxVersion.cpp
@@ -12,9 +12,4 @@ namespace libmatroska {
 
 const std::string KaxCodeVersion = "2.0.0";
 
-// Up to version 1.4.4 this library exported a build date string. As
-// this made the build non-reproducible, replace it by a placeholder to
-// remain binary compatible.
-const std::string KaxCodeDate = "Unknown";
-
 } // namespace libmatroska
diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp
@@ -37,7 +37,7 @@ const char RW_FILENAME[] = "test.kax";
 */
 int main(void)
 {
-  printf("Test00 :\nEBML %s %s / Matroska %s %s\n", EbmlCodeVersion.c_str(), EbmlCodeDate.c_str(), KaxCodeVersion.c_str(), KaxCodeDate.c_str());
+  printf("Test00 :\nEBML %s / Matroska %s\n", EbmlCodeVersion.c_str(), KaxCodeVersion.c_str());
   StdIOCallback Ebml_file(RW_FILENAME, ::MODE_CREATE);
 
   ///// Writing test

diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp
@@ -7,7 +7,6 @@
     \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
-#include "matroska/FileKax.h"
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxCluster.h"

diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp
@@ -8,7 +8,6 @@
 */
 
 #include "matroska/KaxSegment.h"
-#include "matroska/FileKax.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxCluster.h"
@@ -43,8 +42,6 @@ int main(int argc, char **argv)
     try {
   StdIOCallback Cluster_file((argc>=2 ? argv[1] : "muxed.mkv"), MODE_READ);
 
-  // create the Matroska file
-///  FileKax MuxedFile(Cluster_file);
 //  bool bAllowDummy = false; // don't read elements we don't know
   bool bAllowDummy = true; // even read elements we don't know (needed for CRC checking)
 
@@ -56,7 +53,6 @@ int main(int argc, char **argv)
   EbmlElement * ElementLevel3 = nullptr;
   EbmlElement * ElementLevel4 = nullptr;
 
-///  MuxedFile.ReadHead();
   // find the EBML head in the file
   ElementLevel0 = aStream.FindNextID(EBML_INFO(EbmlHead), 0xFFFFFFFFL);
   if (ElementLevel0 != NULL)
@@ -91,8 +87,6 @@ int main(int argc, char **argv)
   {
     if (EbmlId(*ElementLevel0) == EBML_ID(KaxSegment)) {
       Segment = static_cast<KaxSegment*>(ElementLevel0);
-//      MuxedFile.ReadTracks();
-//      MuxedFile.ReadCodec();
       // scan the file for a Tracks element (all previous Level1 elements are discarded)
       ElementLevel1 = aStream.FindNextElement(EBML_CONTEXT(ElementLevel0), UpperElementLevel, 0, bAllowDummy);
 

diff --git a/test/tags/test9.cpp b/test/tags/test9.cpp
@@ -7,7 +7,6 @@
     \author Moritz Bunkus     <mosu @ users.sf.net>
 */
 
-#include <matroska/FileKax.h>
 #include <matroska/KaxBlock.h>
 #include <matroska/KaxCluster.h>
 #include <matroska/KaxCues.h>