mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 23:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklink: Fix build on mingw32 by adding missing WINAPI

Browse source 
gstdecklinkaudiosink.cpp:155:19: error: conflicting type attributes specified for 'virtual HRESULT GStreamerAudioOutputCallback::QueryInterface(const IID&, void**)'
In file included from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/objbase.h:153:0,
                 from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/ole2.h:16,
                 from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/windows.h:94,
                 from /var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/rpc.h:16,
                 from win/DeckLinkAPI.h:27,
                 from gstdecklink.h:35,
                 from gstdecklinkaudiosink.h:27,
                 from gstdecklinkaudiosink.cpp:25:
/var/lib/jenkins/workspace/cerbero-cross-mingw32/workdir/mingw/w32/bin/../lib/gcc/i686-w64-mingw32/4.7.3/../../../../i686-w64-mingw32/include/unknwn.h:67:25: error:   overriding 'virtual HRESULT IUnknown::QueryInterface(const IID&, void**)'

(and many more)

https://ci.gstreamer.net/job/cerbero-cross-mingw32/6407/console
This commit is contained in:
Nirbheek Chauhan 2017-07-19 02:19:47 +05:30
parent 93c379a3fc
commit 0084bfccc9
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/decklink/gstdecklinkaudiosink.cpp
View file

@ -152,12 +152,12 @@ public:
g_mutex_init (&m_mutex); g_mutex_init (&m_mutex);
} }
virtual HRESULT QueryInterface (REFIID, LPVOID *) virtual HRESULT WINAPI QueryInterface (REFIID, LPVOID *)
{ {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
virtual ULONG AddRef (void) virtual ULONG WINAPI AddRef (void)
{ {
ULONG ret; ULONG ret;
@ -169,7 +169,7 @@ public:
return ret; return ret;
} }
virtual ULONG Release (void) virtual ULONG WINAPI Release (void)
{ {
ULONG ret; ULONG ret;
@ -190,7 +190,7 @@ public:
g_mutex_clear (&m_mutex); g_mutex_clear (&m_mutex);
} }
virtual HRESULT RenderAudioSamples (bool preroll) virtual HRESULT WINAPI RenderAudioSamples (bool preroll)
{ {
guint8 *ptr; guint8 *ptr;
gint seg; gint seg;

11
sys/decklink/gstdecklinkvideosink.cpp
View file

@ -38,12 +38,12 @@ public:
g_mutex_init (&m_mutex); g_mutex_init (&m_mutex);
} }
virtual HRESULT QueryInterface (REFIID, LPVOID *) virtual HRESULT WINAPI QueryInterface (REFIID, LPVOID *)
{ {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
virtual ULONG AddRef (void) virtual ULONG WINAPI AddRef (void)
{ {
ULONG ret; ULONG ret;
@ -55,7 +55,7 @@ public:
return ret; return ret;
} }
virtual ULONG Release (void) virtual ULONG WINAPI Release (void)
{ {
ULONG ret; ULONG ret;
@ -71,7 +71,8 @@ public:
return ret; return ret;
} }
virtual HRESULT ScheduledFrameCompleted (IDeckLinkVideoFrame * completedFrame, virtual HRESULT WINAPI ScheduledFrameCompleted (
IDeckLinkVideoFrame * completedFrame,
BMDOutputFrameCompletionResult result) BMDOutputFrameCompletionResult result)
{ {
switch (result) { switch (result) {
@ -96,7 +97,7 @@ public:
return S_OK; return S_OK;
} }
virtual HRESULT ScheduledPlaybackHasStopped (void) virtual HRESULT WINAPI ScheduledPlaybackHasStopped (void)
{ {
GST_LOG_OBJECT (m_sink, "Scheduled playback stopped"); GST_LOG_OBJECT (m_sink, "Scheduled playback stopped");