ardour.git
10 years agoMerge branch 'windows' of git.ardour.org:ardour/ardour into windows
John Emmas [Wed, 31 Jul 2013 14:09:50 +0000 (15:09 +0100)]
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

10 years ago'libs/rubberband' - Platform specific includes
John Emmas [Thu, 25 Jul 2013 08:14:40 +0000 (09:14 +0100)]
'libs/rubberband' - Platform specific includes

10 years ago'libs/rubberband' - Compiler specific includes
John Emmas [Thu, 25 Jul 2013 07:53:05 +0000 (08:53 +0100)]
'libs/rubberband' - Compiler specific includes

10 years ago'libs/rubberband' - Modify to be buildable with MSVC
John Emmas [Thu, 25 Jul 2013 06:49:33 +0000 (07:49 +0100)]
'libs/rubberband' - Modify to be buildable with MSVC

10 years ago'libs/midi++2' - Platform specific includes
John Emmas [Thu, 25 Jul 2013 06:45:24 +0000 (07:45 +0100)]
'libs/midi++2' - Platform specific includes

10 years ago'libs/midi++2' - Compiler specific changes
John Emmas [Thu, 25 Jul 2013 06:30:30 +0000 (07:30 +0100)]
'libs/midi++2' - Compiler specific changes

10 years ago'libs/midi++2' - Modify to be buildable with MSVC
John Emmas [Thu, 25 Jul 2013 06:19:51 +0000 (07:19 +0100)]
'libs/midi++2' - Modify to be buildable with MSVC

10 years agoAdd an empty 'unistd.h' to stop the compiler complaining when it gets unnecessarily...
John Emmas [Wed, 24 Jul 2013 18:09:29 +0000 (19:09 +0100)]
Add an empty 'unistd.h' to stop the compiler complaining when it gets unnecessarily #included

10 years agoFurther changes to msvc/pbd (mostly to add support for getopt and getopt_long)
John Emmas [Wed, 24 Jul 2013 16:46:25 +0000 (17:46 +0100)]
Further changes to msvc/pbd (mostly to add support for getopt and getopt_long)

10 years agoCorrect a typo in 'msvc_pbd.h'
John Emmas [Wed, 24 Jul 2013 09:22:16 +0000 (10:22 +0100)]
Correct a typo in 'msvc_pbd.h'

10 years ago'libs/evoral' - Windows specific includes
John Emmas [Tue, 23 Jul 2013 16:10:06 +0000 (17:10 +0100)]
'libs/evoral' - Windows specific includes

10 years ago'libs/evoral' - Remove ambiguity about which version of 'abs()' we need
John Emmas [Tue, 23 Jul 2013 15:59:15 +0000 (16:59 +0100)]
'libs/evoral' - Remove ambiguity about which version of 'abs()' we need

10 years ago'libs/taglib' - Remove 2 further symlinks which needn't be under git control
John Emmas [Tue, 23 Jul 2013 15:57:27 +0000 (16:57 +0100)]
'libs/taglib' - Remove 2 further symlinks which needn't be under git control

10 years ago'libs/taglib' - Remove 52 x symlinks which needn't be under git control
John Emmas [Tue, 23 Jul 2013 07:12:00 +0000 (08:12 +0100)]
'libs/taglib' - Remove 52 x symlinks which needn't be under git control

10 years ago'libs/evoral' - For each of the NNNN_lower_bound() functions (3 in total) add a non...
John Emmas [Tue, 23 Jul 2013 06:56:30 +0000 (07:56 +0100)]
'libs/evoral' - For each of the NNNN_lower_bound() functions (3 in total) add a non-const iterator to supplement the existing const_iterator

10 years ago'libs/evoral' - Through a compiler extension gcc can implement an array whose size...
John Emmas [Tue, 23 Jul 2013 06:53:57 +0000 (07:53 +0100)]
'libs/evoral' - Through a compiler extension gcc can implement an array whose size in not known at compile time. MSVC doesn't have this extension. Therefore, use std::vector instead

10 years ago'std::isnan' is not available in MSVC (at least, not VC8)
John Emmas [Tue, 23 Jul 2013 06:50:25 +0000 (07:50 +0100)]
'std::isnan' is not available in MSVC (at least, not VC8)

10 years ago'libs/evoral' - cast the returned pointers from malloc() / g_ptr_array_index() etc...
John Emmas [Tue, 23 Jul 2013 06:47:10 +0000 (07:47 +0100)]
'libs/evoral' - cast the returned pointers from malloc() / g_ptr_array_index() etc, as needed to satisfy MSVC

10 years agoRemove an unnecessary #include that prevents 'libs/evoral' from building with MSVC...
John Emmas [Tue, 23 Jul 2013 06:43:48 +0000 (07:43 +0100)]
Remove an unnecessary #include that prevents 'libs/evoral' from building with MSVC (more evoral changes to follow)

10 years agoRemove some unnecessary warnings when building 'libs/qm-dsp' with MSVC
John Emmas [Tue, 23 Jul 2013 06:40:17 +0000 (07:40 +0100)]
Remove some unnecessary warnings when building 'libs/qm-dsp' with MSVC

10 years agoUse common mingw build script to reference location of windows test image
Tim Mayberry [Sat, 20 Jul 2013 00:37:41 +0000 (10:37 +1000)]
Use common mingw build script to reference location of windows test image

10 years agoFix reference to new location of windows test image
Tim Mayberry [Sat, 20 Jul 2013 00:33:48 +0000 (10:33 +1000)]
Fix reference to new location of windows test image

10 years agoUse Glib::usleep for portability
Tim Mayberry [Sat, 20 Jul 2013 00:26:30 +0000 (10:26 +1000)]
Use Glib::usleep for portability

10 years agoUse Glib::usleep for portability
Tim Mayberry [Sat, 20 Jul 2013 00:17:18 +0000 (10:17 +1000)]
Use Glib::usleep for portability

10 years agoUse GLib::usleep for portability
Tim Mayberry [Fri, 19 Jul 2013 08:46:52 +0000 (18:46 +1000)]
Use GLib::usleep for portability

10 years agoundef SearchPath where needed as it is defined via windows.h
Tim Mayberry [Mon, 22 Jul 2013 02:44:45 +0000 (12:44 +1000)]
undef SearchPath where needed as it is defined via windows.h

10 years agoWork around badly chosen argument name in giomm/dbusmessage.h
Tim Mayberry [Sun, 21 Jul 2013 08:49:29 +0000 (18:49 +1000)]
Work around badly chosen argument name in giomm/dbusmessage.h

interface is defined in windows/mingw headers. hopefully this will
be fixed in giomm at some point and this crap can be removed

10 years agoDisable some code on MinGW build until it can be tested NEEDS FIXING
Tim Mayberry [Sat, 20 Jul 2013 00:21:12 +0000 (10:21 +1000)]
Disable some code on MinGW build until it can be tested NEEDS FIXING

Windows has the function strtok_s which is equivalent to strtok_r in versions
of msvcrt in Vista and above but not win XP. So either reimplement for WinXP or replace
with something more portable and C++'y.

10 years ago undef SearchPath where needed as it is defined via windows.h
Tim Mayberry [Sat, 20 Jul 2013 00:17:59 +0000 (10:17 +1000)]
 undef SearchPath where needed as it is defined via windows.h

10 years agoFix ambiguous type CheckMenuItem that is also defined via windows.h
Tim Mayberry [Fri, 19 Jul 2013 08:41:34 +0000 (18:41 +1000)]
Fix ambiguous type CheckMenuItem that is also defined via windows.h

10 years agoUse PBD::ffs for portability
Tim Mayberry [Fri, 19 Jul 2013 08:40:50 +0000 (18:40 +1000)]
Use PBD::ffs for portability

10 years agoFix for ambiguous Polygon type when building with MinGW
Tim Mayberry [Fri, 19 Jul 2013 08:38:46 +0000 (18:38 +1000)]
Fix for ambiguous Polygon type when building with MinGW

10 years agoReinstate include of regex.h for Linux and MinGW build
Tim Mayberry [Mon, 22 Jul 2013 02:01:44 +0000 (12:01 +1000)]
Reinstate include of regex.h for Linux and MinGW build

I'm not sure how boost/regex.h is relevant but it doesn't enable the
build to succeed in on Linux or using Mingw so if this is not an error
and required for msvc build then fix it

10 years agoFix broken using declaration in vamp-plugins
Tim Mayberry [Mon, 22 Jul 2013 01:57:26 +0000 (11:57 +1000)]
Fix broken using declaration in vamp-plugins

10 years agoAdd some dll's to list to copy to mingw based windows package
Tim Mayberry [Sat, 20 Jul 2013 00:38:54 +0000 (10:38 +1000)]
Add some dll's to list to copy to mingw based windows package

These are some new dependencies in Fedora 19 mingw packages

10 years agoUse cross-platform packaging version script in MinGW build
Tim Mayberry [Fri, 19 Jul 2013 08:35:42 +0000 (18:35 +1000)]
Use cross-platform packaging version script in MinGW build

10 years agoDisable building all surface plugins on MinGW build
Tim Mayberry [Thu, 18 Jul 2013 23:32:12 +0000 (09:32 +1000)]
Disable building all surface plugins on MinGW build

10 years agoEnable lxvst support by default and then disable for build targets that don't support it
Tim Mayberry [Sat, 20 Jul 2013 01:44:50 +0000 (11:44 +1000)]
Enable lxvst support by default and then disable for build targets that don't support it

10 years agoRemove lxvst variable from wscript that was no longer in use
Tim Mayberry [Sat, 20 Jul 2013 01:11:39 +0000 (11:11 +1000)]
Remove lxvst variable from wscript that was no longer in use

10 years agoRemove tools/sanity_check dir from build in mingw cross compile
Tim Mayberry [Sat, 20 Jul 2013 00:40:29 +0000 (10:40 +1000)]
Remove tools/sanity_check dir from build in mingw cross compile

This is already added to build further down. I believe this is result of
a partially applied patch.

10 years agoDefine PLATFORM_WINDOWS and COMPILER_MINGW when dist target is set to mingw
Tim Mayberry [Mon, 22 Jul 2013 01:56:18 +0000 (11:56 +1000)]
Define PLATFORM_WINDOWS and COMPILER_MINGW when dist target is set to mingw

10 years agoCorrect file perms on to make scripts executable in windows build files
Tim Mayberry [Thu, 18 Jul 2013 23:33:00 +0000 (09:33 +1000)]
Correct file perms on to make scripts executable in windows build files

10 years agoModify 'libs/vamp-plugins' to be buildable with MSVC
John Emmas [Sat, 20 Jul 2013 07:30:40 +0000 (08:30 +0100)]
Modify 'libs/vamp-plugins' to be buildable with MSVC

10 years agoAdapt libs/pbd/ffs.cc to be buildable with MSVC
John Emmas [Thu, 18 Jul 2013 11:08:34 +0000 (12:08 +0100)]
Adapt libs/pbd/ffs.cc to be buildable with MSVC

10 years agobreak symbol name cycle on non-win32-non-gcc platforms
Paul Davis [Wed, 17 Jul 2013 17:49:12 +0000 (13:49 -0400)]
break symbol name cycle on non-win32-non-gcc platforms

10 years agoJOHNE - remove my earlier test file
John Emmas [Wed, 17 Jul 2013 17:18:02 +0000 (18:18 +0100)]
JOHNE - remove my earlier test file

10 years agoMerge branch 'windows' of git.ardour.org:ardour/ardour into windows
John Emmas [Wed, 17 Jul 2013 17:15:51 +0000 (18:15 +0100)]
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

10 years agoJOHNE - Testing to see if I have write access to the repo
John Emmas [Wed, 17 Jul 2013 15:55:24 +0000 (16:55 +0100)]
JOHNE - Testing to see if I have write access to the repo

10 years agoMiscellaneous header files (needed for building libpbd with MSVC)
John Emmas [Wed, 17 Jul 2013 13:55:20 +0000 (14:55 +0100)]
Miscellaneous header files (needed for building libpbd with MSVC)

10 years agoJOHNE source files (needed for building libpbd with MSVC)
John Emmas [Wed, 17 Jul 2013 13:53:17 +0000 (14:53 +0100)]
JOHNE source files (needed for building libpbd with MSVC)

10 years agoMerge branch 'master' into windows
Paul Davis [Wed, 17 Jul 2013 12:05:59 +0000 (08:05 -0400)]
Merge branch 'master' into windows

10 years agoUse PBD::ffs for portability
Tim Mayberry [Wed, 17 Jul 2013 10:03:34 +0000 (20:03 +1000)]
Use PBD::ffs for portability

10 years agopossible fix for 5591 (show elements after re-adding them)
Robin Gareus [Wed, 17 Jul 2013 11:35:45 +0000 (13:35 +0200)]
possible fix for 5591 (show elements after re-adding them)

10 years agoAdd PBD::ffs function
Tim Mayberry [Wed, 17 Jul 2013 09:29:34 +0000 (19:29 +1000)]
Add PBD::ffs function

10 years agoAllow PBD::canonical_path to compile with mingw build
Tim Mayberry [Wed, 17 Jul 2013 09:05:01 +0000 (19:05 +1000)]
Allow PBD::canonical_path to compile with mingw build

10 years agoUse jack_client_stop_thread on windows
Tim Mayberry [Wed, 17 Jul 2013 08:15:02 +0000 (18:15 +1000)]
Use jack_client_stop_thread on windows

10 years agoMerge branch 'windows' of git://git.ardour.org/ardour/ardour into windows
John Emmas [Wed, 17 Jul 2013 07:24:36 +0000 (08:24 +0100)]
Merge branch 'windows' of git://git.ardour.org/ardour/ardour into windows

10 years agoRemaining changes needed for building libpdb on Windows (except for adding the extra...
John Emmas [Wed, 17 Jul 2013 07:08:46 +0000 (08:08 +0100)]
Remaining changes needed for building libpdb on Windows (except for adding the extra JE source modules)

10 years agoAccommodate 'pthread-win32' and 'boost/regex' (for libpbd)
John Emmas [Wed, 17 Jul 2013 07:06:26 +0000 (08:06 +0100)]
Accommodate 'pthread-win32' and 'boost/regex' (for libpbd)

10 years agoFix ambiguous type CheckMenuItem that is also defined via windows.h
Tim Mayberry [Wed, 17 Jul 2013 06:48:40 +0000 (16:48 +1000)]
Fix ambiguous type CheckMenuItem that is also defined via windows.h

10 years agoWork around badly chosen argument name in giomm
Tim Mayberry [Wed, 17 Jul 2013 06:47:56 +0000 (16:47 +1000)]
Work around badly chosen argument name in giomm

10 years agoAlso define casting macro when using mingw compiler
Tim Mayberry [Wed, 17 Jul 2013 06:47:29 +0000 (16:47 +1000)]
Also define casting macro when using mingw compiler

10 years agoUse file modes supported by mingw compiler on Windows
Tim Mayberry [Wed, 17 Jul 2013 06:45:00 +0000 (16:45 +1000)]
Use file modes supported by mingw compiler on Windows

10 years agoUse g_lstat instead of lstat for portability
Tim Mayberry [Wed, 17 Jul 2013 06:41:48 +0000 (16:41 +1000)]
Use g_lstat instead of lstat for portability

10 years agoOther (Windows specific) includes for libpbd
John Emmas [Wed, 17 Jul 2013 06:38:20 +0000 (07:38 +0100)]
Other (Windows specific) includes for libpbd

10 years agowork around sparse motion notification events when tooltips are disabled
Robin Gareus [Wed, 17 Jul 2013 00:35:02 +0000 (02:35 +0200)]
work around sparse motion notification events when tooltips are disabled

fixes http://tracker.ardour.org/view.php?id=5174

10 years agobump actual publically visible version (oops) 3.3
Paul Davis [Tue, 16 Jul 2013 22:54:45 +0000 (18:54 -0400)]
bump actual publically visible version (oops)

10 years agometer-state 17 and 49 + code-comment
Robin Gareus [Tue, 16 Jul 2013 21:30:21 +0000 (23:30 +0200)]
meter-state 17 and 49 + code-comment

10 years agopossible fix for http://tracker.ardour.org/view.php?id=5586
Robin Gareus [Tue, 16 Jul 2013 20:44:54 +0000 (22:44 +0200)]
possible fix for tracker.ardour.org/view.php?id=5586

10 years agorework metering states 2, 6, 18 and 22
Robin Gareus [Tue, 16 Jul 2013 20:43:23 +0000 (22:43 +0200)]
rework metering states 2, 6, 18 and 22

10 years agofix re-drawing of splitting icon
Robin Gareus [Tue, 16 Jul 2013 20:18:51 +0000 (22:18 +0200)]
fix re-drawing of splitting icon

10 years agorevert functionality of f842e8af2 (meter display in DISK mode)
Robin Gareus [Tue, 16 Jul 2013 19:18:52 +0000 (21:18 +0200)]
revert functionality of f842e8af2 (meter display in DISK mode)

10 years agoRevert "C++11 Building - Use new style struct field inititializing" (this code
Paul Davis [Tue, 16 Jul 2013 18:52:52 +0000 (14:52 -0400)]
Revert "C++11 Building - Use new style struct field inititializing" (this code
change breaks gcc on several platforms).

This reverts commit bf153e58a5e3b31536648bff4b95bf6e0a107c6c.

10 years agoyet another meter+monitoring detail:
Robin Gareus [Tue, 16 Jul 2013 18:37:30 +0000 (20:37 +0200)]
yet another meter+monitoring detail:

"explicit Monitor DISK" + "Transport Stop" + "not track rec-en"
 -> meter is always zero

10 years ago'libs/pbd/file_utils.cc' didn't apply cleanly for some reason
John Emmas [Tue, 16 Jul 2013 18:13:18 +0000 (19:13 +0100)]
'libs/pbd/file_utils.cc' didn't apply cleanly for some reason

10 years agoMerge branch 'clang' of https://github.com/axetota/ardour
Robin Gareus [Tue, 16 Jul 2013 17:49:50 +0000 (19:49 +0200)]
Merge branch 'clang' of https://github.com/axetota/ardour

10 years agofix metering states 34, 38, 49, 50, 53 and 54
Robin Gareus [Tue, 16 Jul 2013 17:37:36 +0000 (19:37 +0200)]
fix metering states 34, 38, 49, 50, 53 and 54

for state descriptions see
http://www.oofus.co.uk/ardour/Ardour3MonitorModesV3.pdf

10 years agozero meters for inactive tracks
Robin Gareus [Tue, 16 Jul 2013 17:36:57 +0000 (19:36 +0200)]
zero meters for inactive tracks

10 years agoWindows (compiler specific) includes for libpbd
John Emmas [Tue, 16 Jul 2013 17:00:49 +0000 (18:00 +0100)]
Windows (compiler specific) includes for libpbd

10 years agomove ff* structs & typedef into dedicated namespace
Robin Gareus [Sun, 14 Jul 2013 14:34:49 +0000 (16:34 +0200)]
move ff* structs & typedef into dedicated namespace

(further avoid conflicts with plugins)

10 years agoincrease spacing between meter ticks and labels
Robin Gareus [Tue, 16 Jul 2013 15:55:18 +0000 (17:55 +0200)]
increase spacing between meter ticks and labels

10 years agoRMS meter - reset after calculating new data
Robin Gareus [Tue, 16 Jul 2013 14:25:27 +0000 (16:25 +0200)]
RMS meter - reset after calculating new data

10 years agofix "monitor mode 11"
Robin Gareus [Tue, 16 Jul 2013 14:04:41 +0000 (16:04 +0200)]
fix "monitor mode 11"

see http://www.oofus.co.uk/ardour/Ardour3MonitorModesV2.pdf
the overall logic can probably be simplified somewhat
track-rec-enable on -> always monitor input

10 years agofix input metering:
Robin Gareus [Tue, 16 Jul 2013 13:11:50 +0000 (15:11 +0200)]
fix input metering:

if meter==input, meter depends on In/Disk
see also 29108187ed

10 years agoAdd c++11 enablement options in wscript
Michael R. Fisher [Mon, 15 Jul 2013 22:27:21 +0000 (17:27 -0500)]
Add c++11 enablement options in wscript
- adds "--cxx11" toggle for ./waf configure
- The switch adds appropriate compiler flags and tests the compiler
  for usability of c++11
- This 'should' be compatible for linux, osx, and windows systems
  that have gcc and/or clang with support c++11

10 years agoTemporary OSX/Clang/C++11 workaround
Michael R. Fisher [Mon, 15 Jul 2013 21:53:55 +0000 (16:53 -0500)]
Temporary OSX/Clang/C++11 workaround
- Adds a directive that includes <vector> upon specific conditions
- WIP

10 years agoDereference pointers in ctors where appropriate. (c++11 wants this)
Michael R. Fisher [Mon, 15 Jul 2013 21:52:50 +0000 (16:52 -0500)]
Dereference pointers in ctors where appropriate. (c++11 wants this)

10 years agoC++11 Building - Use new style struct field inititializing
Michael R. Fisher [Mon, 15 Jul 2013 21:47:07 +0000 (16:47 -0500)]
C++11 Building - Use new style struct field inititializing
- clang with std=c++11 enabled was failing here

10 years agoInclude evoral/Note.hpp before pbd/compose.h
Michael R. Fisher [Mon, 15 Jul 2013 21:45:34 +0000 (16:45 -0500)]
Include evoral/Note.hpp before pbd/compose.h
- This workaround prevents a clang compiler error about template
  visibility

10 years agoAllow compiling with c++11 enabled
Michael R. Fisher [Mon, 15 Jul 2013 21:44:03 +0000 (16:44 -0500)]
Allow compiling with c++11 enabled

10 years agoC++11 Building - Add space between macros and quoted strings
Michael R. Fisher [Mon, 15 Jul 2013 21:42:20 +0000 (16:42 -0500)]
C++11 Building - Add space between macros and quoted strings

10 years agoTypo fixed: call class method instead of trying to use as a variable
Michael R. Fisher [Mon, 15 Jul 2013 21:38:54 +0000 (16:38 -0500)]
Typo fixed: call class method instead of trying to use as a variable

10 years agoOSX GUI - Prevent compiler errors when -std=c++11 is switched on
Michael R. Fisher [Mon, 15 Jul 2013 21:35:20 +0000 (16:35 -0500)]
OSX GUI - Prevent compiler errors when -std=c++11 is switched on

10 years agofinally get to the bottom of where NO_PLUGIN_STATE needs to be in order to be useful
Paul Davis [Tue, 16 Jul 2013 02:23:16 +0000 (22:23 -0400)]
finally get to the bottom of where NO_PLUGIN_STATE needs to be in order to be useful

10 years agomore plugin state debugging
Paul Davis [Tue, 16 Jul 2013 00:35:31 +0000 (20:35 -0400)]
more plugin state debugging

10 years agotweaks to NO_PLUGIN_STATE logic
Paul Davis [Tue, 16 Jul 2013 00:04:37 +0000 (20:04 -0400)]
tweaks to NO_PLUGIN_STATE logic

10 years agoadd option to disable cairo-RGBA overlays for meters.
Robin Gareus [Mon, 15 Jul 2013 22:56:36 +0000 (00:56 +0200)]
add option to disable cairo-RGBA overlays for meters.

10 years agoMerge branch 'apple' of https://github.com/mfisher31/ardour
Paul Davis [Mon, 15 Jul 2013 19:04:01 +0000 (15:04 -0400)]
Merge branch 'apple' of https://github.com/mfisher31/ardour

10 years agouse g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several...
Paul Davis [Mon, 15 Jul 2013 18:29:00 +0000 (14:29 -0400)]
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files

10 years agoStartup BETA Mac Screen - Pull version number from VERSIONSTRING
Michael R. Fisher [Mon, 15 Jul 2013 18:00:35 +0000 (13:00 -0500)]
Startup BETA Mac Screen - Pull version number from VERSIONSTRING