Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMediaCtrl patch from Ryan:

Browse Source 
- factored out Active X code into separate files
- also refactored common part of all backends in mediactrlcmn.cpp
- adds async loading from URLs support to Mac version
- support for ShowPlayerControls() in Mac wxMediaCtrl
- more minor bug fixes in the MSW version and the sample

(this is slightly modified patch 1264533 (without the list control part))


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-11 11:04:00 +00:00
parent 86e778e267
commit bf354396f6
16 changed files with 2147 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/msw/makefile.bcc
View File

@@ -697,7 +697,8 @@ MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
MEDIADLL_OBJECTS = \
$(OBJS)\mediadll_dummy.obj \
$(OBJS)\mediadll_mediactrlcmn.obj \
$(OBJS)\mediadll_mediactrl.obj
$(OBJS)\mediadll_mediactrl.obj \
$(OBJS)\mediadll_activex.obj
MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -708,7 +709,8 @@ MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
MEDIALIB_OBJECTS = \
$(OBJS)\medialib_dummy.obj \
$(OBJS)\medialib_mediactrlcmn.obj \
$(OBJS)\medialib_mediactrl.obj
$(OBJS)\medialib_mediactrl.obj \
$(OBJS)\medialib_activex.obj
ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1050,6 +1052,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(____ADVANCED_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_mediactrlcmn.obj \
$(OBJS)\monodll_mediactrl.obj \
$(OBJS)\monodll_activex.obj \
$(OBJS)\monodll_helpbest.obj \
$(OBJS)\monodll_helpctrl.obj \
$(OBJS)\monodll_helpdata.obj \
@@ -1561,6 +1564,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_mediactrlcmn.obj \
$(OBJS)\monolib_mediactrl.obj \
$(OBJS)\monolib_activex.obj \
$(OBJS)\monolib_helpbest.obj \
$(OBJS)\monolib_helpctrl.obj \
$(OBJS)\monolib_helpdata.obj \
@@ -4339,6 +4343,9 @@ $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6024,6 +6031,9 @@ $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10241,6 +10251,9 @@ $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H $**
@@ -10250,6 +10263,9 @@ $(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**