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 0000000000..9722098787 Binary files /dev/null and b/gtk2_ardour/icons/fader_handle.png differ 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: Mod4> +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