C bindings, fileref, fix warnings

Author: ufleisch

bindings/c/CMakeLists.txt

@@ -63,6 +63,12 @@ if(WITH_SHORTEN)
     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/shorten
   )
 endif()
+if(WITH_MATROSKA)
+  set(tag_c_HDR_DIRS ${tag_c_HDR_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/matroska
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/matroska/ebml
+  )
+endif()
 include_directories(${tag_c_HDR_DIRS})
 
 set(tag_c_HDRS tag_c.h)

bindings/c/tag_c.cpp

@@ -80,6 +80,9 @@
 #ifdef TAGLIB_WITH_SHORTEN
 #include "shortenfile.h"
 #endif
+#ifdef TAGLIB_WITH_MATROSKA
+#include "matroskafile.h"
+#endif
 
 using namespace TagLib;
 
@@ -241,6 +244,11 @@ TagLib_File *taglib_file_new_type_any_char(const T *filename, TagLib_File_Type t
   case TagLib_File_SHORTEN:
     file = new Shorten::File(filename);
     break;
+#endif
+#ifdef TAGLIB_WITH_MATROSKA
+  case TagLib_File_MATROSKA:
+    file = new Matroska::File(filename);
+    break;
 #endif
   default:
     break;

bindings/c/tag_c.h

@@ -132,7 +132,8 @@ typedef enum {
   TagLib_File_Opus,
   TagLib_File_DSF,
   TagLib_File_DSDIFF,
-  TagLib_File_SHORTEN
+  TagLib_File_SHORTEN,
+  TagLib_File_MATROSKA
 } TagLib_File_Type;
 
 /*!

taglib/fileref.cpp

@@ -296,6 +296,10 @@ namespace
     else if(Shorten::File::isSupported(stream))
       file = new Shorten::File(stream, readAudioProperties, audioPropertiesStyle);
 #endif
+#ifdef TAGLIB_WITH_MATROSKA
+    else if(Matroska::File::isSupported(stream))
+      file = new Matroska::File(stream, readAudioProperties, audioPropertiesStyle);
+#endif
 
     // isSupported() only does a quick check, so double check the file here.
 
@@ -520,6 +524,11 @@ StringList FileRef::defaultFileExtensions()
 #ifdef TAGLIB_WITH_SHORTEN
   l.append("shn");
 #endif
+#ifdef TAGLIB_WITH_MATROSKA
+  l.append("mkv");
+  l.append("mka");
+  l.append("webm");
+#endif
 
   return l;
 }

taglib/matroska/ebml/ebmlmksegment.h

@@ -51,11 +51,9 @@ namespace TagLib {
       Matroska::Segment* parseSegment();
 
     private:
-      offset_t dataOffset = 0;
       MkTags *tags = nullptr;
       MkAttachments *attachments = nullptr;
       MkSeekHead *seekHead = nullptr;
-
     };
   }
 }

taglib/matroska/ebml/ebmlstringelement.cpp

@@ -54,7 +54,7 @@ ByteVector EBML::StringElement<t>::render()
   std::string string = value.to8Bit(t == String::UTF8);
   dataSize = string.size();
   buffer.append(renderVINT(dataSize, 0));
-  buffer.append(ByteVector(string.data(), dataSize));
+  buffer.append(ByteVector(string.data(), static_cast<unsigned int>(dataSize)));
   return buffer;
 }
 template ByteVector EBML::StringElement<String::UTF8>::render();

taglib/matroska/ebml/ebmlutils.cpp

@@ -64,7 +64,7 @@ std::pair<int, T> EBML::readVINT(File &file)
 
   if(nb_bytes > 1)
     buffer.append(file.readBlock(nb_bytes - 1));
-  int bits_to_shift = (sizeof(T) * 8) - (7 * nb_bytes);
+  int bits_to_shift = static_cast<int>(sizeof(T) * 8) - (7 * nb_bytes);
   offset_t mask = 0xFFFFFFFFFFFFFFFF >> bits_to_shift;
   return { nb_bytes, static_cast<T>(buffer.toLongLong(true)) & mask };
 }
@@ -83,7 +83,7 @@ std::pair<int, T> EBML::parseVINT(const ByteVector &buffer)
   if(!numBytes)
     return {0, 0};
 
-  int bits_to_shift = (sizeof(T) * 8) - (7 * numBytes);
+  int bits_to_shift = static_cast<int>(sizeof(T) * 8) - (7 * numBytes);
   offset_t mask = 0xFFFFFFFFFFFFFFFF >> bits_to_shift;
   return { numBytes, static_cast<T>(buffer.toLongLong(true)) & mask };
 }

taglib/matroska/ebml/ebmlvoidelement.cpp

@@ -32,12 +32,12 @@ ByteVector EBML::VoidElement::render()
   offset_t bytesNeeded = targetSize;
   ByteVector buffer = renderId();
   bytesNeeded -= buffer.size();
-  sizeLength = std::min(bytesNeeded, static_cast<offset_t>(8));
+  sizeLength = static_cast<int>(std::min(bytesNeeded, static_cast<offset_t>(8)));
   bytesNeeded -= sizeLength;
   dataSize = bytesNeeded;
   buffer.append(renderVINT(dataSize, sizeLength));
   if (dataSize)
-    buffer.append(ByteVector(dataSize, 0));
+    buffer.append(ByteVector(static_cast<unsigned int>(dataSize), 0));
 
   return buffer;
 }

taglib/matroska/matroskaattachedfile.h

@@ -48,10 +48,10 @@ namespace TagLib {
 
     private:
       class AttachedFilePrivate;
+      TAGLIB_MSVC_SUPPRESS_WARNING_NEEDS_TO_HAVE_DLL_INTERFACE
       std::unique_ptr<AttachedFilePrivate> d;
-
     };
   }
 }
 
-#endif
+#endif

taglib/matroska/matroskaattachments.h

@@ -55,10 +55,10 @@ namespace TagLib {
       friend class EBML::MkAttachments;
       friend class Matroska::File;
       class AttachmentsPrivate;
+      TAGLIB_MSVC_SUPPRESS_WARNING_NEEDS_TO_HAVE_DLL_INTERFACE
       std::unique_ptr<AttachmentsPrivate> d;
-
     };
   }
 }
 
-#endif
+#endif