From f300eaba93a1ef069950daaabea28a6cf9923ec6 Mon Sep 17 00:00:00 2001 From: Grygorii Zharun Date: Wed, 26 Mar 2014 06:31:34 -0500 Subject: [PATCH] [Summary] Fixed MAC build [Details] Added fixes to make the code cross platform compilable [Reviewed by] N/A [git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 446294] --- .dir-locals.el | 4 - .gitignore | 145 ------------------ doc/.gitignore | 2 - doc/canvas.svg | 0 doc/classes/make.sh | 0 doc/layering/.gitignore | 3 - doc/layering/build.sh | 0 doc/mainpage.txt | 0 gtk2_ardour/arcall | 0 gtk2_ardour/ardbg | 0 gtk2_ardour/ardbg-scons | 0 gtk2_ardour/ardev | 0 gtk2_ardour/arldd | 0 gtk2_ardour/arprof-scons | 0 gtk2_ardour/artest | 0 gtk2_ardour/arval | 0 gtk2_ardour/arval-scons | 0 gtk2_ardour/icons/fader_handle.png | Bin 0 -> 2426 bytes gtk2_ardour/version.cc | 3 + gtk2_ardour/version.h | 7 + gtk2_ardour/waves_dialog.cc | 5 +- headless/hardbg | 0 headless/hardev | 0 libs/ardour/ardour/version.h | 8 + libs/ardour/config_text.cc | 42 +++++ libs/ardour/revision.cc | 2 + libs/ardour/run-profiling.sh | 0 libs/ardour/test-env.sh | 0 libs/ardour/version.cc | 3 + .../UserInterfaceState.xcuserstate | Bin 0 -> 5803 bytes .../pm_mac/pmdefaults/make/find-classrefs.sh | 0 libs/backends/wavesaudio/waves_midi_event.cc | 1 - .../devicemanager/WCMRAudioDeviceManager.cpp | 6 +- .../devicemanager/WCMRAudioDeviceManager.h | 1 + .../wavesapi/devicemanager/WCMRNativeAudio.h | 1 - libs/canvas/build-and-run-benchmark.sh | 0 libs/canvas/build-and-run-manual-test.sh | 0 libs/canvas/build-and-run-tests.sh | 0 libs/canvas/canvas/version.h | 8 + libs/canvas/doc/make.sh | 0 libs/canvas/run-manual-test.sh | 0 libs/canvas/run-tests.sh | 0 libs/canvas/version.cc | 3 + libs/gtkmm2ext/gtkmm2ext/version.h | 8 + libs/gtkmm2ext/version.cc | 3 + libs/midi++2/midi++/version.h | 8 + libs/midi++2/version.cc | 3 + libs/pbd/pbd/version.h | 8 + libs/pbd/test/ProtoolsPatchFile.midnam | 0 libs/pbd/version.cc | 3 + patch.diff | 47 ++++++ tools/bug_tool/ardour_bugs | 0 tools/config.guess | 0 tools/define_versions.sh | 0 tools/fmt-bindings | 0 tools/linux_packaging/build | 0 tools/linux_packaging/package | 0 tools/linux_packaging/stage2.run | 0 tools/osx_packaging/osx_build | 0 tools/session_exchange.py | 0 vst/ardevst | 0 waf | Bin 62 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 .dir-locals.el delete mode 100644 .gitignore delete mode 100644 doc/.gitignore mode change 100755 => 100644 doc/canvas.svg mode change 100644 => 100755 doc/classes/make.sh delete mode 100644 doc/layering/.gitignore mode change 100644 => 100755 doc/layering/build.sh mode change 100755 => 100644 doc/mainpage.txt mode change 100755 => 100644 gtk2_ardour/arcall mode change 100755 => 100644 gtk2_ardour/ardbg mode change 100755 => 100644 gtk2_ardour/ardbg-scons mode change 100755 => 100644 gtk2_ardour/ardev mode change 100755 => 100644 gtk2_ardour/arldd mode change 100755 => 100644 gtk2_ardour/arprof-scons mode change 100755 => 100644 gtk2_ardour/artest mode change 100755 => 100644 gtk2_ardour/arval mode change 100755 => 100644 gtk2_ardour/arval-scons create mode 100644 gtk2_ardour/icons/fader_handle.png create mode 100644 gtk2_ardour/version.cc create mode 100644 gtk2_ardour/version.h mode change 100755 => 100644 headless/hardbg mode change 100755 => 100644 headless/hardev create mode 100644 libs/ardour/ardour/version.h create mode 100644 libs/ardour/config_text.cc create mode 100644 libs/ardour/revision.cc mode change 100644 => 100755 libs/ardour/run-profiling.sh mode change 100644 => 100755 libs/ardour/test-env.sh create mode 100644 libs/ardour/version.cc create mode 100644 libs/backends/wavesaudio/portmidi/src/pm_mac/pm_mac.xcodeproj/project.xcworkspace/xcuserdata/VKamyshniy.xcuserdatad/UserInterfaceState.xcuserstate mode change 100644 => 100755 libs/backends/wavesaudio/portmidi/src/pm_mac/pmdefaults/make/find-classrefs.sh mode change 100644 => 100755 libs/canvas/build-and-run-benchmark.sh mode change 100644 => 100755 libs/canvas/build-and-run-manual-test.sh mode change 100644 => 100755 libs/canvas/build-and-run-tests.sh create mode 100644 libs/canvas/canvas/version.h mode change 100644 => 100755 libs/canvas/doc/make.sh mode change 100644 => 100755 libs/canvas/run-manual-test.sh mode change 100644 => 100755 libs/canvas/run-tests.sh create mode 100644 libs/canvas/version.cc create mode 100644 libs/gtkmm2ext/gtkmm2ext/version.h create mode 100644 libs/gtkmm2ext/version.cc create mode 100644 libs/midi++2/midi++/version.h create mode 100644 libs/midi++2/version.cc create mode 100644 libs/pbd/pbd/version.h mode change 100755 => 100644 libs/pbd/test/ProtoolsPatchFile.midnam create mode 100644 libs/pbd/version.cc create mode 100644 patch.diff mode change 100755 => 100644 tools/bug_tool/ardour_bugs mode change 100755 => 100644 tools/config.guess mode change 100644 => 100755 tools/define_versions.sh mode change 100755 => 100644 tools/fmt-bindings mode change 100755 => 100644 tools/linux_packaging/build mode change 100755 => 100644 tools/linux_packaging/package mode change 100755 => 100644 tools/linux_packaging/stage2.run mode change 100755 => 100644 tools/osx_packaging/osx_build mode change 100755 => 100644 tools/session_exchange.py mode change 100755 => 100644 vst/ardevst mode change 100755 => 100644 waf diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index 8c6047cf50..0000000000 --- a/.dir-locals.el +++ /dev/null @@ -1,4 +0,0 @@ -((nil . ((fill-column . 79))) - (c-mode . ((indent-tabs-mode . t))) - (c++-mode . ((indent-tabs-mode . t))) - (python-mode . ((indent-tabs-mode . nil)))) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 811d6f89d6..0000000000 --- a/.gitignore +++ /dev/null @@ -1,145 +0,0 @@ -*.[oa] -*.o -*.os -*.binding -*.so -*.dylib -*.pyc - -# autotools -aclocal.m4 -config.log -config.status -config.guess -config.sub -Makefile -Makefile.in -autom4te.cache -stamp-h1 -libtool -ltmain.sh -install-sh -depcomp -.deps - -# OSX -.DS_STORE - -# misc editor/tools -*~ -*.swp -*.kdev4 -.gdb_history -core -core.* -vgcore.* -cscope.files -cscope.out -tags - -# generated folders doc, build, packaging -.waf-* -.waf3-* -.lock-waf* -/build/ -/doc/html/ -/doc/latex/ -/tools/osx_packaging/Resources/ - - -# translations -/gtk2_ardour/po/*.mo -/gtk2_ardour/*.pot -/libs/ardour/po/*.mo -/libs/ardour/ardour3.pot -/libs/ardour/libardour.pot -/libs/gtkmm2ext/po/*.mo -/libs/gtkmm2ext/libgtkmm2ext.pot - -# /gtk2_ardour/ -/gtk2_ardour/ardour.sh -/gtk2_ardour/ardev_common.sh -/gtk2_ardour/*.bindings -/gtk2_ardour/*.rc -/gtk2_ardour/version.cc -/gtk2_ardour/version.h - -# /libs/ardour/ -/libs/ardour/version.cc -/libs/ardour/ardour/version.h -/libs/ardour/revision.cc -/libs/ardour/config_text.cc - -# /libs/canvas -/libs/canvas/version.cc -/libs/canvas/canvas/version.h - -# /libs/gtkmm2ext/ -/libs/gtkmm2ext/*.pot -/libs/gtkmm2ext/*.mo -/libs/gtkmm2ext/*.po -/libs/gtkmm2ext/version.cc -/libs/gtkmm2ext/gtkmm2ext/version.h - -# /libs/midi++2/ -/libs/midi++2/version.cc -/libs/midi++2/midi++/version.h - -# /libs/pbd/ -/libs/pbd/version.cc -/libs/pbd/pbd/version.h - -/libs/taglib/taglib/flacproperties.h -/libs/taglib/taglib/apefooter.h -/libs/taglib/taglib/apeitem.h -/libs/taglib/taglib/apetag.h -/libs/taglib/taglib/attachedpictureframe.h -/libs/taglib/taglib/commentsframe.h -/libs/taglib/taglib/flacfile.h -/libs/taglib/taglib/id3v2tag.h -/libs/taglib/taglib/generalencapsulatedobjectframe.h -/libs/taglib/taglib/id3v1genres.h -/libs/taglib/taglib/id3v1tag.h -/libs/taglib/taglib/id3v2extendedheader.h -/libs/taglib/taglib/id3v2footer.h -/libs/taglib/taglib/id3v2frame.h -/libs/taglib/taglib/id3v2framefactory.h -/libs/taglib/taglib/id3v2header.h -/libs/taglib/taglib/id3v2synchdata.h -/libs/taglib/taglib/oggpageheader.h -/libs/taglib/taglib/mpcfile.h -/libs/taglib/taglib/mpcproperties.h -/libs/taglib/taglib/mpegfile.h -/libs/taglib/taglib/mpegheader.h -/libs/taglib/taglib/mpegproperties.h -/libs/taglib/taglib/oggfile.h -/libs/taglib/taglib/oggflacfile.h -/libs/taglib/taglib/oggpage.h -/libs/taglib/taglib/textidentificationframe.h -/libs/taglib/taglib/relativevolumeframe.h -/libs/taglib/taglib/speexfile.h -/libs/taglib/taglib/speexproperties.h -/libs/taglib/taglib/taglib.h -/libs/taglib/taglib/tbytevector.h -/libs/taglib/taglib/tbytevectorlist.h -/libs/taglib/taglib/tdebug.h -/libs/taglib/taglib/tlist.h -/libs/taglib/taglib/tmap.h -/libs/taglib/taglib/trueaudiofile.h -/libs/taglib/taglib/trueaudioproperties.h -/libs/taglib/taglib/tstring.h -/libs/taglib/taglib/tstringlist.h -/libs/taglib/taglib/tfile.h -/libs/taglib/taglib/urllinkframe.h -/libs/taglib/taglib/unicode.h -/libs/taglib/taglib/uniquefileidentifierframe.h -/libs/taglib/taglib/unknownframe.h -/libs/taglib/taglib/unsynchronizedlyricsframe.h -/libs/taglib/taglib/xiphcomment.h -/libs/taglib/taglib/vorbisfile.h -/libs/taglib/taglib/vorbisproperties.h -/libs/taglib/taglib/wavpackfile.h -/libs/taglib/taglib/wavpackproperties.h -/libs/taglib/taglib/xingheader.h -/libs/taglib/taglib/tlist.tcc -/libs/taglib/taglib/tmap.tcc diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 2ec816f3ef..0000000000 --- a/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -html -latex diff --git a/doc/canvas.svg b/doc/canvas.svg old mode 100755 new mode 100644 diff --git a/doc/classes/make.sh b/doc/classes/make.sh old mode 100644 new mode 100755 diff --git a/doc/layering/.gitignore b/doc/layering/.gitignore deleted file mode 100644 index debc120c45..0000000000 --- a/doc/layering/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.aux -*.pdf -*.log diff --git a/doc/layering/build.sh b/doc/layering/build.sh old mode 100644 new mode 100755 diff --git a/doc/mainpage.txt b/doc/mainpage.txt old mode 100755 new mode 100644 diff --git a/gtk2_ardour/arcall b/gtk2_ardour/arcall old mode 100755 new mode 100644 diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg old mode 100755 new mode 100644 diff --git a/gtk2_ardour/ardbg-scons b/gtk2_ardour/ardbg-scons old mode 100755 new mode 100644 diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev old mode 100755 new mode 100644 diff --git a/gtk2_ardour/arldd b/gtk2_ardour/arldd old mode 100755 new mode 100644 diff --git a/gtk2_ardour/arprof-scons b/gtk2_ardour/arprof-scons old mode 100755 new mode 100644 diff --git a/gtk2_ardour/artest b/gtk2_ardour/artest old mode 100755 new mode 100644 diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval old mode 100755 new mode 100644 diff --git a/gtk2_ardour/arval-scons b/gtk2_ardour/arval-scons old mode 100755 new mode 100644 diff --git a/gtk2_ardour/icons/fader_handle.png b/gtk2_ardour/icons/fader_handle.png new file mode 100644 index 0000000000000000000000000000000000000000..972209878723bbaf65ae165ceefd2f1f3e288876 GIT binary patch literal 2426 zcmaJ@dpwkB8=kb39I`1(#59yc=7?b?hZx7?&|r|ln0YanL-W2E4Y7!o*%CSIk5WWJ zBSM(8CKQEgzm((wfO*k2lTT)j?sy)(tQi zOu@;~mMmE{B`;>ZjN~hmbLY8aQG@J!AP;sh6iwvWTL(o_Pfq=%~&^R1Yl7R$cSP+$mWP#eN z47LDB<1#o9gUy1kFj9lqk&p#KqV(?;n4E94Eb!|!NiGb{qjJz#6lSHR)kGJUe@|sH zzh#3E8Td!<|0M=JV>kes41nxNE=@AHVC|Js93qJeP$4$glg*A;y+!v>HpB))*&H~@ z!vuweyHIHi)=K0H!o`K?!~!8Iiv~E^S|B7GC;wF$0q$scZ{y8BqY;p37#!zcfu`d|wOU zyL?}<^zUo2{w@|R5rbYC?f;B=H6-!R%J!RaC5La;2Urrnb0x;Uo#f>JgGo<1*;;$@ z`fKx?SRI;i zGX5eXN5@|Z&0nm2JYO zb|7`yP6y#`mCh^%Jm7<}1#)?Y`{b z8kxKA#TFu@agIsPckTjn3-5NWYer) zQk9!>(m>^i`KFjQ{VNYBCw(i$)<09@taz*-yZ(O5N2(pXsEl*0OjAt9C*6l z9Upg_=iM*jd^m?Ru+>KbNg)+x;@xP@)3TvVFcg-!%Tl(WS*b z!j$|G>4?iiVe57C8q_jDfgEl?yK(yM+X|6Lq@^}}ue~q5;?g?53HP)KRLxeuJ7u>L z_`3~H#qHG+sSFhCZ+_$@ERgbxx<)s_DHpoUZ1s{)f5z0!t{At@JxHjyYAw(e+b8i2 z$XSLzN0RS0a;3fSNOT*vA=;F!`#>voXj@{lUP)>Tvf5-`q@mV5oGJ!&8w_Ex!j_+q zQFnS_>)Hefd8y3Jj*I}yA05(6>o;5Ro1`iao|*rgh3%=WVDP40&ouldUi_#x)$?A8 zLp*#vS6b!ta>%pH^HTN&7dGy8t?4MiP1Ki-AUH{3o2ERoGUn?ewr#k6F;jNeewE_# zZnueA;`xp!qk@IBtpXXjsxwmSgkrV1pvJQXrxNOV<&`V;I~WmcuMB;pKbAi*+By0( zfc3kd;dtjK14{PEq1=Z%oeh>_E-2}oR*a}b)s`~XZd)JjEIp=ovaa|ht?6Cc=!KYt zmMLA1i>}@9=2y52L+(-IYkXaQ{6)Iuc5CcQqQjkVb(_cR5+%|jh)KCtw|jD<)O2af zXpyq&;K@Wsww&U+M0YR1$MEI0Gu5(_+Fs+f9{c`-@2l;gw;5}P^MUhnGKIcxFV(v- zFS_pVZaZHv&@UG^%^4{1R;_80-_%;9pFvlgb1W?lTWoLXE%RTSKA6|;7WC)x62CC6 z@j?0f#jepd_kD|L{(VPZ&|F)|SB>8ph>?2rt;I zsj0bq?#;D<;;Ad|%i1S0cPXsNKz0ViPK1^QMR;i(I4kgOHi?h&Zt$AjJ(O?x!EaPQ znRLbDnS;#OdA_AUMC}y8Qrb6G((VzTR_EfYeU2}jc&;pp(eHh=_nq!+|A|)bUD3C< z_q|X4mHVU{o`RMh2FqqEjmo;F#Yd`uF!bYs&7Ur5x%bHLu`FllQcsiGv*HF6rqxZb z2W3xa1Pt0Zh#7g2=G*<%0@M_AJ@ICkw(2;IouiS@VjeeqI^34=Ao?OCb8usP@eymT zN$$;J@nHldYQD8oPE7kynBB$O?*Dpkx=3!guw~??EeP1Vy;i>WTdq%mF!{FJVv%Kz iKRHYY&9oCf%VJ<6dWp9|)VR~i-;k4?tF6!`F!3)CQ4c5p literal 0 HcmV?d00001 diff --git a/gtk2_ardour/version.cc b/gtk2_ardour/version.cc new file mode 100644 index 0000000000..9a255dbffa --- /dev/null +++ b/gtk2_ardour/version.cc @@ -0,0 +1,3 @@ +int gtk2_ardour_major_version = 3; +int gtk2_ardour_minor_version = 5; +int gtk2_ardour_micro_version = 0; diff --git a/gtk2_ardour/version.h b/gtk2_ardour/version.h new file mode 100644 index 0000000000..7265c958e3 --- /dev/null +++ b/gtk2_ardour/version.h @@ -0,0 +1,7 @@ +#ifndef __gtk2_ardour_version_h__ +#define __gtk2_ardour_version_h__ + extern const char* gtk2_ardour_revision; + extern int gtk2_ardour_major_version; + extern int gtk2_ardour_minor_version; + extern int gtk2_ardour_micro_version; +#endif /* __gtk2_ardour_version_h__ */ diff --git a/gtk2_ardour/waves_dialog.cc b/gtk2_ardour/waves_dialog.cc index cb7f99be67..980e44aee2 100644 --- a/gtk2_ardour/waves_dialog.cc +++ b/gtk2_ardour/waves_dialog.cc @@ -37,6 +37,9 @@ #include "utils.h" #include "window_manager.h" +#if defined(_WIN32) + #define strcasecmp _stricmp +#endif using namespace std; using namespace Gtk; @@ -255,7 +258,7 @@ WavesDialog::read_layout (std::string file_name) XMLTree layout(layout_file, false); XMLNode* root = layout.root(); - if ((root == NULL) || stricmp(root->name().c_str(), "dialog")) { + if ((root == NULL) || strcasecmp(root->name().c_str(), "dialog")) { return false; } diff --git a/headless/hardbg b/headless/hardbg old mode 100755 new mode 100644 diff --git a/headless/hardev b/headless/hardev old mode 100755 new mode 100644 diff --git a/libs/ardour/ardour/version.h b/libs/ardour/ardour/version.h new file mode 100644 index 0000000000..16af5247a4 --- /dev/null +++ b/libs/ardour/ardour/version.h @@ -0,0 +1,8 @@ +#ifndef __libardour3_version_h__ +#define __libardour3_version_h__ +#include "ardour/libardour_visibility.h" +LIBARDOUR_API extern const char* libardour3_revision; +LIBARDOUR_API extern int libardour3_major_version; +LIBARDOUR_API extern int libardour3_minor_version; +LIBARDOUR_API extern int libardour3_micro_version; +#endif /* __libardour3_version_h__ */ diff --git a/libs/ardour/config_text.cc b/libs/ardour/config_text.cc new file mode 100644 index 0000000000..0e70047c75 --- /dev/null +++ b/libs/ardour/config_text.cc @@ -0,0 +1,42 @@ +#include "ardour/ardour.h" +namespace ARDOUR { +const char* const ardour_config_info = "\n\ +Build documentation: False\n\ +Debuggable build: True\n\ +Export all symbols (backtrace): True\n\ +Install prefix: C:/msys\n\ +Strict compiler flags: []\n\ +Internal Shared Libraries: True\n\ +Use External Libraries: False\n\ +Library exports hidden: True\n\ +Architecture flags: None\n\ +Aubio: True\n\ +AudioUnits: False\n\ +No plugin state: False\n\ +Build target: mingw\n\ +CoreAudio: False\n\ +Debug RT allocations: False\n\ +Process thread timing: False\n\ +Denormal exceptions: False\n\ +FLAC: True\n\ +FPU optimization: False\n\ +Freedesktop files: False\n\ +LV2 UI embedding: False\n\ +LV2 support: False\n\ +LXVST support: False\n\ +OGG: True\n\ +Phone home: True\n\ +Program name: Ardour\n\ +Samplerate: True\n\ +Translation: True\n\ +Unit tests: False\n\ +Universal binary: False\n\ +Generic x86 CPU: False\n\ +Windows VST support: False\n\ +Wiimote support: False\n\ +Windows key: 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 L8`s!xQqKPY@X^3( literal 0 HcmV?d00001 diff --git a/libs/backends/wavesaudio/portmidi/src/pm_mac/pmdefaults/make/find-classrefs.sh b/libs/backends/wavesaudio/portmidi/src/pm_mac/pmdefaults/make/find-classrefs.sh old mode 100644 new mode 100755 diff --git a/libs/backends/wavesaudio/waves_midi_event.cc b/libs/backends/wavesaudio/waves_midi_event.cc index 8a0f674e31..08b8bdfc65 100644 --- a/libs/backends/wavesaudio/waves_midi_event.cc +++ b/libs/backends/wavesaudio/waves_midi_event.cc @@ -16,7 +16,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include "memory.h" #include "waves_midi_event.h" diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.cpp index 54099cacba..00ee1c247f 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.cpp @@ -10,10 +10,6 @@ #include "WCMRAudioDeviceManager.h" - - - - //********************************************************************************************** // WCMRAudioDevice::WCMRAudioDevice // @@ -542,6 +538,7 @@ uint32_t WCMRAudioDevice::GetLatency (bool isInput) return 0; } + //********************************************************************************************** // WCMRAudioDeviceManager::WCMRAudioDeviceManager // @@ -560,7 +557,6 @@ WCMRAudioDeviceManager::WCMRAudioDeviceManager(WCMRAudioDeviceManagerClient *pTh } - //********************************************************************************************** // WCMRAudioDeviceManager::~WCMRAudioDeviceManager // diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h index c7a7d78016..a3b1baa784 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h @@ -193,6 +193,7 @@ protected: float m_MonitorGain; ///< Amount of gain to apply for monitoring signal. }; + // This enum is for choosing filter for audio devices scan typedef enum eAudioDeviceFilter { diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h index 59f41c7f2c..75c5e1430c 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.h @@ -36,7 +36,6 @@ protected: bool m_UseMultithreading; bool m_bNoCopyAudioBuffer; ///< This flag determines whether the audio callback performs a copy of audio, or the source/sink perform the copy. It should be true to let source/sink do the copies. - }; diff --git a/libs/canvas/build-and-run-benchmark.sh b/libs/canvas/build-and-run-benchmark.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/build-and-run-manual-test.sh b/libs/canvas/build-and-run-manual-test.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/build-and-run-tests.sh b/libs/canvas/build-and-run-tests.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/canvas/version.h b/libs/canvas/canvas/version.h new file mode 100644 index 0000000000..63d4391705 --- /dev/null +++ b/libs/canvas/canvas/version.h @@ -0,0 +1,8 @@ +#ifndef __libcanvas_version_h__ +#define __libcanvas_version_h__ +#include "canvas/visibility.h" +LIBCANVAS_API extern const char* libcanvas_revision; +LIBCANVAS_API extern int libcanvas_major_version; +LIBCANVAS_API extern int libcanvas_minor_version; +LIBCANVAS_API extern int libcanvas_micro_version; +#endif /* __libcanvas_version_h__ */ diff --git a/libs/canvas/doc/make.sh b/libs/canvas/doc/make.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/run-manual-test.sh b/libs/canvas/run-manual-test.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/run-tests.sh b/libs/canvas/run-tests.sh old mode 100644 new mode 100755 diff --git a/libs/canvas/version.cc b/libs/canvas/version.cc new file mode 100644 index 0000000000..903fa425c6 --- /dev/null +++ b/libs/canvas/version.cc @@ -0,0 +1,3 @@ +int libcanvas_major_version = 3; +int libcanvas_minor_version = 5; +int libcanvas_micro_version = 0; diff --git a/libs/gtkmm2ext/gtkmm2ext/version.h b/libs/gtkmm2ext/gtkmm2ext/version.h new file mode 100644 index 0000000000..73c91715f0 --- /dev/null +++ b/libs/gtkmm2ext/gtkmm2ext/version.h @@ -0,0 +1,8 @@ +#ifndef __libgtkmm2ext_version_h__ +#define __libgtkmm2ext_version_h__ +#include "gtkmm2ext/visibility.h" +LIBGTKMM2EXT_API extern const char* libgtkmm2ext_revision; +LIBGTKMM2EXT_API extern int libgtkmm2ext_major_version; +LIBGTKMM2EXT_API extern int libgtkmm2ext_minor_version; +LIBGTKMM2EXT_API extern int libgtkmm2ext_micro_version; +#endif /* __libgtkmm2ext_version_h__ */ diff --git a/libs/gtkmm2ext/version.cc b/libs/gtkmm2ext/version.cc new file mode 100644 index 0000000000..ca03e1c89e --- /dev/null +++ b/libs/gtkmm2ext/version.cc @@ -0,0 +1,3 @@ +int libgtkmm2ext_major_version = 0; +int libgtkmm2ext_minor_version = 8; +int libgtkmm2ext_micro_version = 3; diff --git a/libs/midi++2/midi++/version.h b/libs/midi++2/midi++/version.h new file mode 100644 index 0000000000..51f27b8935 --- /dev/null +++ b/libs/midi++2/midi++/version.h @@ -0,0 +1,8 @@ +#ifndef __midipp_version_h__ +#define __midipp_version_h__ +#include "midi++/libmidi_visibility.h" +LIBMIDIPP_API extern const char* midipp_revision; +LIBMIDIPP_API extern int midipp_major_version; +LIBMIDIPP_API extern int midipp_minor_version; +LIBMIDIPP_API extern int midipp_micro_version; +#endif /* __midipp_version_h__ */ diff --git a/libs/midi++2/version.cc b/libs/midi++2/version.cc new file mode 100644 index 0000000000..72e767bca5 --- /dev/null +++ b/libs/midi++2/version.cc @@ -0,0 +1,3 @@ +int midipp_major_version = 2; +int midipp_minor_version = 1; +int midipp_micro_version = 1; diff --git a/libs/pbd/pbd/version.h b/libs/pbd/pbd/version.h new file mode 100644 index 0000000000..a2c7d5b769 --- /dev/null +++ b/libs/pbd/pbd/version.h @@ -0,0 +1,8 @@ +#ifndef __libpbd_version_h__ +#define __libpbd_version_h__ +#include "pbd/libpbd_visibility.h" +LIBPBD_API extern const char* libpbd_revision; +LIBPBD_API extern int libpbd_major_version; +LIBPBD_API extern int libpbd_minor_version; +LIBPBD_API extern int libpbd_micro_version; +#endif /* __libpbd_version_h__ */ diff --git a/libs/pbd/test/ProtoolsPatchFile.midnam b/libs/pbd/test/ProtoolsPatchFile.midnam old mode 100755 new mode 100644 diff --git a/libs/pbd/version.cc b/libs/pbd/version.cc new file mode 100644 index 0000000000..61a94f6fc9 --- /dev/null +++ b/libs/pbd/version.cc @@ -0,0 +1,3 @@ +int libpbd_major_version = 4; +int libpbd_minor_version = 1; +int libpbd_micro_version = 0; diff --git a/patch.diff b/patch.diff new file mode 100644 index 0000000000..2d4e68280b --- /dev/null +++ b/patch.diff @@ -0,0 +1,47 @@ +From 87184ab80d80b1ef0301344bfd633b2d81476c9a Mon Sep 17 00:00:00 2001 +From: Paul Davis +Date: Mon, 24 Mar 2014 17:47:56 -0400 +Subject: [PATCH] fix a race condition between the death of a thread that + communicates with an UI event loop and the event loop itself. + +The comment tries to explain it all. There may be a better solution, but I believe that this one is +(a) safe (b) better than the old approach. +--- + libs/pbd/pbd/abstract_ui.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc +index 67c39b5..b0ac676 100644 +--- a/libs/pbd/pbd/abstract_ui.cc ++++ b/libs/pbd/pbd/abstract_ui.cc +@@ -44,18 +44,18 @@ cleanup_request_buffer (void* ptr) + { + RequestBuffer* rb = (RequestBuffer*) ptr; + +- /* there is the question of why we don't simply erase the request +- * buffer and delete it right here, since we have to take the lock +- * anyway. ++ /* this is called when the thread for which this request buffer was ++ * allocated dies. That could be before or after the end of the UI ++ * event loop that the request buffer communicates. + * +- * as of april 24th 2012, i don't have a good answer to that. ++ * We are not modifying the UI's thread/buffer map, just marking it ++ * dead. If the UI is currently processing the buffers and misses ++ * this "dead" signal, it will find it the next time it receives ++ * a request. If the UI has finished processing requests, then ++ * we will leak this buffer object. + */ + +- +- { +- Glib::Threads::Mutex::Lock lm (rb->ui.request_buffer_map_lock); +- rb->dead = true; +- } ++ rb->dead = true; + } + + template +-- +1.8.1.msysgit.1 + diff --git a/tools/bug_tool/ardour_bugs b/tools/bug_tool/ardour_bugs old mode 100755 new mode 100644 diff --git a/tools/config.guess b/tools/config.guess old mode 100755 new mode 100644 diff --git a/tools/define_versions.sh b/tools/define_versions.sh old mode 100644 new mode 100755 diff --git a/tools/fmt-bindings b/tools/fmt-bindings old mode 100755 new mode 100644 diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build old mode 100755 new mode 100644 diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package old mode 100755 new mode 100644 diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run old mode 100755 new mode 100644 diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build old mode 100755 new mode 100644 diff --git a/tools/session_exchange.py b/tools/session_exchange.py old mode 100755 new mode 100644 diff --git a/vst/ardevst b/vst/ardevst old mode 100755 new mode 100644 diff --git a/waf b/waf old mode 100755 new mode 100644