Fix building decklink on win32

diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp
index e6323a181cb69462ae30e90082b37786b223fc67..995697e01ca30962535eb67495916d11f4c7d543 100644 (file)
--- a/src/modules/decklink/consumer_decklink.cpp
+++ b/src/modules/decklink/consumer_decklink.cpp
@@ -286,12 +286,16 @@ public:
 
                if ( !mlt_frame_get_audio( frame, (void**) &pcm, &format, &frequency, &m_channels, &samples ) )
                {
+#ifdef WIN32
+                       unsigned long written = 0;
+#else
                        uint32_t written = 0;
+#endif
                        BMDTimeValue streamTime = m_count * frequency * m_duration / m_timescale;
                        m_deckLinkOutput->GetBufferedAudioSampleFrameCount( &written );
                        if ( written > (m_preroll + 1) * samples )
                        {
-                               mlt_log_verbose( getConsumer(), "renderAudio: will flush %d audiosamples\n", written );
+                               mlt_log_verbose( getConsumer(), "renderAudio: will flush %lu audiosamples\n", written );
                                m_deckLinkOutput->FlushBufferedAudioSamples();
                        };
 #ifdef WIN32
@@ -301,7 +305,7 @@ public:
 #endif
 
                        if ( written != (uint32_t) samples )
-                               mlt_log_verbose( getConsumer(), "renderAudio: samples=%d, written=%u\n", samples, written );
+                               mlt_log_verbose( getConsumer(), "renderAudio: samples=%d, written=%lu\n", samples, written );
                }
        }
 
@@ -478,12 +482,16 @@ public:
                        m_reprio = true;
                };
 
+#ifdef WIN32
+               unsigned long cnt;
+#else
                uint32_t cnt;
+#endif
                m_deckLinkOutput->GetBufferedAudioSampleFrameCount( &cnt );
                if ( cnt != m_acnt )
                {
                        mlt_log_verbose( getConsumer(),
-                               "ScheduledFrameCompleted: GetBufferedAudioSampleFrameCount %u -> %u, m_count=%"PRIu64"\n",
+                               "ScheduledFrameCompleted: GetBufferedAudioSampleFrameCount %u -> %lu, m_count=%"PRIu64"\n",
                                m_acnt, cnt, m_count );
                        m_acnt = cnt;
                }

diff --git a/src/modules/decklink/producer_decklink.cpp b/src/modules/decklink/producer_decklink.cpp
index 171bf04a1879d7824164c6e5a9b0a327037f9924..5c81d9f83fd616651093b4c91cff039b8e347ece 100644 (file)
--- a/src/modules/decklink/producer_decklink.cpp
+++ b/src/modules/decklink/producer_decklink.cpp
@@ -392,7 +392,11 @@ public:
                        {
                                const char* timecodeString = 0;
 
+#ifdef WIN32
+                               if ( timecode->GetString( (BSTR*) &timecodeString ) == S_OK )
+#else
                                if ( timecode->GetString( &timecodeString ) == S_OK )
+#endif
                                {
                                        mlt_properties_set( MLT_FRAME_PROPERTIES( frame ), "meta.attr.vitc.markup", timecodeString );
                                        mlt_log_debug( getProducer(), "timecode %s\n", timecodeString );