onebinary: fix global name collisions in InputISMV

Author: iameli

meson.build

@@ -219,7 +219,7 @@ onebinary_stuff += 'MistInFLV'
 onebinary_stuff += 'MistInFolder'
 onebinary_stuff += 'MistInH264'
 onebinary_stuff += 'MistInHLS'
-# onebinary_stuff += 'MistInISMV'
+onebinary_stuff += 'MistInISMV'
 onebinary_stuff += 'MistInMP3'
 onebinary_stuff += 'MistInMP4'
 onebinary_stuff += 'MistInOGG'

src/input/input_ismv.cpp

@@ -102,7 +102,7 @@ namespace Mist{
 
     if (!buffered.size()){return;}
 
-    seekPos thisPos = *buffered.begin();
+    seekPosISMV thisPos = *buffered.begin();
     buffered.erase(buffered.begin());
 
     fseek(inFile, thisPos.position, SEEK_SET);
@@ -252,7 +252,7 @@ namespace Mist{
 
     currentPosition = ftell(inFile) + 8;
     for (unsigned int i = 0; i < trunBox.getSampleInformationCount(); i++){
-      seekPos myPos;
+      seekPosISMV myPos;
       myPos.position = currentPosition;
       myPos.trackId = trackId;
       myPos.time = currentTime;

src/input/input_ismv.h

@@ -7,8 +7,8 @@
 #include <set>
 
 namespace Mist{
-  struct seekPos{
-    bool operator<(const seekPos &rhs) const{
+  struct seekPosISMV{
+    bool operator<(const seekPosISMV &rhs) const{
       if (time < rhs.time){return true;}
       return (time == rhs.time && trackId < rhs.trackId);
     }
@@ -40,7 +40,7 @@ namespace Mist{
     bool readMoofSkipMdat(size_t &tId, std::vector<MP4::trunSampleInformation> &trunSamples);
 
     void bufferFragmentData(size_t trackId, uint32_t keyNum);
-    std::set<seekPos> buffered;
+    std::set<seekPosISMV> buffered;
     std::map<size_t, uint32_t> lastKeyNum;
 
     Util::ResizeablePointer dataPointer;