Windows build fixes.

diff --git a/src/asset.cc b/src/asset.cc
index de299d34a93b914bfd487a12a3fb9e88c1b11d10..f8362c8b16ca61c16d18e7e8eb32b4fac6dd3854 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -123,8 +123,8 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                        return notes;
                }
                
-               ifstream a (mxf_path().c_str(), ios::binary);
-               ifstream b (other->mxf_path().c_str(), ios::binary);
+               ifstream a (mxf_path().string().c_str(), ios::binary);
+               ifstream b (other->mxf_path().string().c_str(), ios::binary);
 
                int buffer_size = 65536;
                char abuffer[buffer_size];

diff --git a/src/asset_map.h b/src/asset_map.h
index 34e301a59f26f8aa68cfee5bae54da6b0c5ab6a7..3f51ca12b8bc07bc2ad1eccce56a69fa1521b546 100644 (file)
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include "xml.h"
 

diff --git a/src/cpl.h b/src/cpl.h
index f49b6efbcf39b03bd43535ef37be3942f8bed81d..a0426b96d29a2bddfb7a19772e19c37d25fde740 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include "xml.h"
 

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index d94561948f897fc34e258816e68681a7072a1d86..e35dcc62cac972da596047459957e42645bc7401 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -100,7 +100,7 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        fill_writer_info (&writer_info);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
-       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) {
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) {
                throw FileError ("could not open MXF file for writing", mxf_path().string());
        }
 
@@ -147,12 +147,12 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                     
        if (flags & MXF_INSPECT) {
                ASDCP::JP2K::MXFReader reader_A;
-               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) {
+               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) {
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 
                ASDCP::JP2K::MXFReader reader_B;
-               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) {
+               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) {
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 9a738a08f89d8e4a7e45444e694c9de37dc017e8..ed815eda96549c45cc3cb6672c79e6659f538ab2 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -120,7 +120,7 @@ SoundAsset::construct (sigc::slot<string, Channel> get_path)
        fill_writer_info (&writer_info);
 
        ASDCP::PCM::MXFWriter mxf_writer;
-       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, audio_desc))) {
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, audio_desc))) {
                throw FileError ("could not open audio MXF for writing", mxf_path().string());
        }
 
@@ -183,13 +183,13 @@ SoundAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                     
        if (flags & MXF_INSPECT) {
                ASDCP::PCM::MXFReader reader_A;
-               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) {
+               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) {
                        cout << "failed " << mxf_path() << "\n";
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }
 
                ASDCP::PCM::MXFReader reader_B;
-               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) {
+               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) {
                        cout << "failed " << other->mxf_path() << "\n";
                        throw FileError ("could not open MXF file for reading", mxf_path().string());
                }

diff --git a/src/xml.h b/src/xml.h
index 7cfb8e913a2bef63909af81b8f33a0392fe2c3b1..2469981c877d1d48b34fcacc4c6dddcc155c194d 100644 (file)
--- a/src/xml.h
+++ b/src/xml.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <list>
+#include <stdint.h>
 #include <glibmm.h>
 #include <boost/shared_ptr.hpp>
 #include "types.h"