[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

@@ -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))))

.gitignore

@@ -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

doc/.gitignore

@@ -1,2 +0,0 @@
-html
-latex

doc/layering/.gitignore

@@ -1,3 +0,0 @@
-*.aux
-*.pdf
-*.log

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;

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__ */

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;
 	}
 

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__ */

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><Super\n\
+C compiler flags: ['-Ic:\\Users\\VKamyshniy\\ardour\\ardour', '-O0', '-g', '-fshow-column', '-DPLATFORM_WINDOWS', '-DCOMPILER_MINGW', '-DWAF_BUILD', '-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE', '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64', '-DENABLE_NLS', '-DPROGRAM_NAME=\"Ardour\"', '-Wstrict-prototypes', '-Wmissing-prototypes']\n\
+C++ compiler flags: ['-Ic:\\Users\\VKamyshniy\\ardour\\ardour', '-O0', '-g', '-fshow-column', '-DPLATFORM_WINDOWS', '-DCOMPILER_MINGW', '-DWAF_BUILD', '-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE', '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64', '-DENABLE_NLS', '-DPROGRAM_NAME=\"Ardour\"', '-Woverloaded-virtual', '-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG']\n\
+Linker flags: ['-Wl,--enable-auto-import', '-Wl,--enable-auto-import']\n\
+";
+}

libs/ardour/revision.cc

@@ -0,0 +1,2 @@
+#include "ardour/revision.h"
+namespace ARDOUR { const char* revision = "3.5-1720-g97a537c"; }

libs/ardour/version.cc

@@ -0,0 +1,3 @@
+int libardour3_major_version = 3;
+int libardour3_minor_version = 5;
+int libardour3_micro_version = 0;

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"
 

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
 //

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
 {

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.
 
-
 };
 
 

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__ */

libs/canvas/version.cc

@@ -0,0 +1,3 @@
+int libcanvas_major_version = 3;
+int libcanvas_minor_version = 5;
+int libcanvas_micro_version = 0;

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__ */

libs/gtkmm2ext/version.cc

@@ -0,0 +1,3 @@
+int libgtkmm2ext_major_version = 0;
+int libgtkmm2ext_minor_version = 8;
+int libgtkmm2ext_micro_version = 3;

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__ */

libs/midi++2/version.cc

@@ -0,0 +1,3 @@
+int midipp_major_version = 2;
+int midipp_minor_version = 1;
+int midipp_micro_version = 1;

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__ */

libs/pbd/version.cc

@@ -0,0 +1,3 @@
+int libpbd_major_version = 4;
+int libpbd_minor_version = 1;
+int libpbd_micro_version = 0;

patch.diff

@@ -0,0 +1,47 @@
+From 87184ab80d80b1ef0301344bfd633b2d81476c9a Mon Sep 17 00:00:00 2001
+From: Paul Davis <paul@linuxaudiosystems.com>
+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<typename R>
+-- 
+1.8.1.msysgit.1
+