John Emmas [Mon, 14 Oct 2013 16:19:39 +0000 (17:19 +0100)]
'AudioEngine::discover_backends()' - When building a debuggable backend module on Windows (e.g. jack_backend.dll) accommodate the Windows convention that Debug builds generally have a suffix added to their name
John Emmas [Mon, 14 Oct 2013 16:14:23 +0000 (17:14 +0100)]
'gtk2_ardour' - Add some further header files to satisfy MSVC build
John Emmas [Mon, 14 Oct 2013 16:07:45 +0000 (17:07 +0100)]
'gtk2_ardour' - Harmonize usage of 'COMPILER_MINGW' and 'COMPILER_MSVC' where appropriate
John Emmas [Mon, 14 Oct 2013 16:05:42 +0000 (17:05 +0100)]
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
John Emmas [Mon, 14 Oct 2013 16:00:28 +0000 (17:00 +0100)]
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
John Emmas [Fri, 11 Oct 2013 17:23:53 +0000 (18:23 +0100)]
Merge branch 'windows' into windows+cc
Paul Davis [Wed, 9 Oct 2013 18:00:42 +0000 (14:00 -0400)]
Merge ... master, fixing conflicts in 3 wscript files
Paul Davis [Wed, 9 Oct 2013 17:57:00 +0000 (13:57 -0400)]
when looking for backends, search for *.dll as well as *.so and *.dylib
Paul Davis [Tue, 8 Oct 2013 21:12:20 +0000 (17:12 -0400)]
reduce version requirement for JACK
Paul Davis [Tue, 8 Oct 2013 20:13:39 +0000 (16:13 -0400)]
move JACK configuration test(s) down to where they belong (in libs/backend/jack)
Paul Davis [Tue, 8 Oct 2013 18:16:13 +0000 (14:16 -0400)]
remove link-time use of JACK, since it is now dlopen'ed by the chosen backend
Paul Davis [Tue, 8 Oct 2013 18:02:03 +0000 (14:02 -0400)]
restore jack timebase master and jack session callback functionality (moved into the JACK backend)
Paul Davis [Tue, 8 Oct 2013 18:01:43 +0000 (14:01 -0400)]
-arestore jack timebase master and jack session callback functionality (moved into the JACK backend)
Paul Davis [Tue, 8 Oct 2013 16:22:49 +0000 (12:22 -0400)]
updated DE translation from edgar aichinger
Paul Davis [Tue, 8 Oct 2013 16:22:08 +0000 (12:22 -0400)]
updated DE translation from edgar aichinger
Paul Davis [Tue, 8 Oct 2013 16:18:27 +0000 (12:18 -0400)]
fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog
Paul Davis [Tue, 8 Oct 2013 00:46:10 +0000 (20:46 -0400)]
possible relief for snapshot loading
Paul Davis [Tue, 8 Oct 2013 00:30:28 +0000 (20:30 -0400)]
remove debug output
Paul Davis [Tue, 8 Oct 2013 00:30:06 +0000 (20:30 -0400)]
use AudioEngine destructor to do necessary stuff when shutting it down, and remove unused Config stuff in AudioEngine
Paul Davis [Tue, 8 Oct 2013 00:29:05 +0000 (20:29 -0400)]
change return type on ARDOUR::cleanup() since nobody cares what it returns
Paul Davis [Tue, 8 Oct 2013 00:28:20 +0000 (20:28 -0400)]
delete the UI from main() to get full cleanup
Paul Davis [Tue, 8 Oct 2013 00:27:54 +0000 (20:27 -0400)]
use new GtkUI design in ARDOUR_UI
Paul Davis [Tue, 8 Oct 2013 00:27:04 +0000 (20:27 -0400)]
change tortured GtkUI startup process into something just a little more sane, and remove "stopping" code since that belongs in a destructor
Paul Davis [Tue, 8 Oct 2013 00:17:49 +0000 (20:17 -0400)]
window proxy should delete its window during its destructor
Paul Davis [Sun, 6 Oct 2013 20:32:02 +0000 (16:32 -0400)]
fix up some aspects of loading from a cmdline session name
John Emmas [Sun, 6 Oct 2013 10:56:03 +0000 (11:56 +0100)]
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
John Emmas [Sun, 6 Oct 2013 10:01:25 +0000 (11:01 +0100)]
Miscellaneous additions to 'msvc_extra_headers'
John Emmas [Sun, 6 Oct 2013 10:00:10 +0000 (11:00 +0100)]
'gtk2_ardour' - In 'Note' c'tor, don't try to set 'rectangle->name' unless 'CANVAS_DEBUG' is defined
John Emmas [Sun, 6 Oct 2013 09:52:41 +0000 (10:52 +0100)]
'gtk2_ardour' - One further Glib::usleep needed
John Emmas [Sun, 6 Oct 2013 09:50:45 +0000 (10:50 +0100)]
'gtk2_ardour' - Some further casting
Paul Davis [Fri, 4 Oct 2013 18:00:20 +0000 (14:00 -0400)]
Merge branch 'audiothreads' of https://github.com/mojofunk/ardour
Paul Davis [Fri, 4 Oct 2013 17:02:41 +0000 (13:02 -0400)]
remove another unnecessary use of libgen.h
Paul Davis [Fri, 4 Oct 2013 17:00:59 +0000 (13:00 -0400)]
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least), part 2
Paul Davis [Fri, 4 Oct 2013 16:50:03 +0000 (12:50 -0400)]
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least)
Paul Davis [Fri, 4 Oct 2013 16:46:31 +0000 (12:46 -0400)]
switch from MAXPATHLEN to PATH_MAX, and use <limits.h> not <sys/param.h> for portability
Paul Davis [Fri, 4 Oct 2013 16:46:02 +0000 (12:46 -0400)]
remove unnecessary header include
Paul Davis [Fri, 4 Oct 2013 16:22:00 +0000 (12:22 -0400)]
provide PBD::demangle() even on platforms without HAVE_EXECINFO
Paul Davis [Fri, 4 Oct 2013 15:46:50 +0000 (11:46 -0400)]
remove OSC related cruft from ardour_ui_options.cc
control surface activation is handled via an entirely separate mechanism now
Tim Mayberry [Thu, 3 Oct 2013 09:38:58 +0000 (19:38 +1000)]
Implement JACKAudioBackend::in_process_thread
Tim Mayberry [Wed, 2 Oct 2013 09:40:48 +0000 (19:40 +1000)]
Move processing thread list from ARDOUR::Graph into AudioBackend implementation
Tim Mayberry [Wed, 14 Aug 2013 10:30:09 +0000 (20:30 +1000)]
Add AudioBackendThread class to support different thread type on windows
John Emmas [Thu, 3 Oct 2013 08:57:25 +0000 (09:57 +0100)]
'gtk2_ardour' - Make sure that 'getpid()' can be found when building with MSVC
John Emmas [Thu, 3 Oct 2013 08:52:39 +0000 (09:52 +0100)]
'gtk2_ardour' - Use 'const_iterator' where appropriate, instead of 'iterator'
John Emmas [Thu, 3 Oct 2013 08:50:34 +0000 (09:50 +0100)]
'gtk2_ardour' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC
John Emmas [Thu, 3 Oct 2013 08:48:19 +0000 (09:48 +0100)]
'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8)
John Emmas [Thu, 3 Oct 2013 08:43:55 +0000 (09:43 +0100)]
'gtk2_ardour' - When building with MSVC, use 'std::min' + 'std::max' rather than 'fmin' + 'fmax'
John Emmas [Thu, 3 Oct 2013 08:34:52 +0000 (09:34 +0100)]
'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC)
John Emmas [Thu, 3 Oct 2013 08:32:08 +0000 (09:32 +0100)]
'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf'
John Emmas [Thu, 3 Oct 2013 08:27:40 +0000 (09:27 +0100)]
'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat'
John Emmas [Thu, 3 Oct 2013 08:12:02 +0000 (09:12 +0100)]
'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
John Emmas [Thu, 3 Oct 2013 08:06:56 +0000 (09:06 +0100)]
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
Paul Davis [Wed, 2 Oct 2013 20:17:22 +0000 (16:17 -0400)]
fix up crash caused by changes in object creation order and setting the state of the click IO object
John Emmas [Thu, 26 Sep 2013 14:17:40 +0000 (15:17 +0100)]
Add a header file guard (to prevent multiple #inclusion)
John Emmas [Thu, 26 Sep 2013 10:47:17 +0000 (11:47 +0100)]
Deliberately specify 'Gtk::manage' where necessary (avoids creating ambiguities when we #include this header file elsewhere)
John Emmas [Thu, 26 Sep 2013 10:01:15 +0000 (11:01 +0100)]
A further change which needs to be tested on the other compilers
(splitting a long string into 2 x concatenated strings)
John Emmas [Thu, 26 Sep 2013 09:58:07 +0000 (10:58 +0100)]
'gtk2_ardour (msvc)' - Some changes needed before anything at all will compile
For the most part, the compilation problems are caused by lines such as:-
WM::Proxy<ThemeManager> theme_manager;
Before MSVC will compile the above it needs to know that the specified object type contains an appropriate (i.e. publicly available) default c'tor. Therefore the corresponding header file needs to get #included, rather than just declaring that type to be a class (whilst all classes have a default c'tor, it needn't necessarily be public). The remaining changes are mostly minor.
This commit should be tested ASAP to make sure it doesn't upset the other compilers.
Paul Davis [Thu, 26 Sep 2013 02:56:28 +0000 (22:56 -0400)]
don't ping JACK server 4 times to see if it is already up when ardour starts
Paul Davis [Wed, 25 Sep 2013 22:24:32 +0000 (18:24 -0400)]
fix up enum mess caused by switching from JACK to Engine as the name for jack-related transport sync
This will allow older versions of Ardour to continue to startup when the user sync preference is "JACK",
because the string used by enum_2_string() will still be "JACK".
Versions of ardour3 from git after the enum change until this commit will leave ardour.rc unloaded by old
versions of Ardour ***if*** the user sync choice was "JACK".
Paul Davis [Wed, 25 Sep 2013 21:59:10 +0000 (17:59 -0400)]
make information extraction from session file options list robust against some old badly formatted session files
Fixes crash experienced by GillesM, where a rogue XML entry caused a segfault
John Emmas [Wed, 25 Sep 2013 14:56:01 +0000 (15:56 +0100)]
Define 'suseconds_t' which isn't normally defined for Windows
John Emmas [Wed, 25 Sep 2013 14:52:11 +0000 (15:52 +0100)]
Merge branch 'cairocanvas' into windows+cc
Paul Davis [Wed, 25 Sep 2013 14:38:04 +0000 (10:38 -0400)]
only generate some current canvas debug output when CANVAS_DEBUG is defined, to quieten things down
Paul Davis [Wed, 25 Sep 2013 14:36:42 +0000 (10:36 -0400)]
add casting for MSVC sqrt
Paul Davis [Wed, 25 Sep 2013 14:36:21 +0000 (10:36 -0400)]
fix a typo in canvas-debug.h
Paul Davis [Wed, 25 Sep 2013 02:22:43 +0000 (22:22 -0400)]
start explicitly linking against libtimecode (this needs to happen elsewhere too)
Paul Davis [Wed, 25 Sep 2013 02:22:16 +0000 (22:22 -0400)]
fix crash when cmdline provides session name
Paul Davis [Tue, 24 Sep 2013 03:13:07 +0000 (23:13 -0400)]
tighten up layout of session dialog; make button say cancel or quit in difference scenarios
Paul Davis [Tue, 24 Sep 2013 03:12:42 +0000 (23:12 -0400)]
shrink small-splash.png image by 50%
Paul Davis [Tue, 24 Sep 2013 01:36:13 +0000 (21:36 -0400)]
use new Session API to show session SR and disk bit depth in recent sessions list
Paul Davis [Tue, 24 Sep 2013 01:35:51 +0000 (21:35 -0400)]
add new static functions to get SR and disk sample format from session XML
Paul Davis [Tue, 24 Sep 2013 01:35:17 +0000 (21:35 -0400)]
move rate_as_string() from EngineControl to utils.cc
Paul Davis [Mon, 23 Sep 2013 20:49:24 +0000 (16:49 -0400)]
move announcements frame around in the session dialog and adjust spacing/borders
Paul Davis [Mon, 23 Sep 2013 18:41:52 +0000 (14:41 -0400)]
major rearrangement of startup/session loading code
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
Paul Davis [Mon, 23 Sep 2013 17:33:28 +0000 (13:33 -0400)]
the output of git describe --tags is not subject to localization, so we do not need LANG= in the environment when it runs
Paul Davis [Sun, 22 Sep 2013 23:22:56 +0000 (19:22 -0400)]
use WindowManager/WMProxy to correctly manage the audio/MIDI setup window
Paul Davis [Sun, 22 Sep 2013 15:19:34 +0000 (11:19 -0400)]
make session creation from a template work again
Paul Davis [Sat, 21 Sep 2013 17:56:59 +0000 (13:56 -0400)]
remove use-session-as-template option from new session dialog and fix ability to not use a template
Note: using a template is still not actually working ...
Paul Davis [Sat, 21 Sep 2013 17:22:06 +0000 (13:22 -0400)]
make sure the template selector has an item visible if there are any
Paul Davis [Sat, 21 Sep 2013 17:14:33 +0000 (13:14 -0400)]
apply same always-check-display to recent sessions scroller in new session dialog
It turns out that we always create a new ArdourStartup right now, so this and the previous commit
are not actually necessary, but they do pave the way for keeping the dialog around instead
Paul Davis [Sat, 21 Sep 2013 16:51:30 +0000 (12:51 -0400)]
reset the visibility of the template selector stuff every time the startup/NSD gets mapped, so that it is always current
Paul Davis [Sat, 21 Sep 2013 16:50:45 +0000 (12:50 -0400)]
likely fix for creating new sessions from templates
John Emmas [Sat, 21 Sep 2013 08:17:25 +0000 (09:17 +0100)]
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Paul Davis [Fri, 20 Sep 2013 20:45:04 +0000 (16:45 -0400)]
if new session button clicked, clear any selection in recent sessions and mark browser unused
Paul Davis [Fri, 20 Sep 2013 20:16:30 +0000 (16:16 -0400)]
Revert "actually load new state after creating a session."
This reverts commit
914ba475de48f72e57bb6ac8a81888ad71cea7fa.
Unclear why I applied this or what it was supposed to do. A new session has no
state.
Paul Davis [Fri, 20 Sep 2013 20:05:54 +0000 (16:05 -0400)]
move advanced new session options into an expander, change some wording
Paul Davis [Fri, 20 Sep 2013 19:21:14 +0000 (15:21 -0400)]
Merge branch 'master' of https://github.com/nmains/ardour
Paul Davis [Fri, 20 Sep 2013 18:30:50 +0000 (14:30 -0400)]
rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine
This is needed in order to get ardour started if ardour.rc names "JACK" as the sync source
Paul Davis [Fri, 20 Sep 2013 18:17:59 +0000 (14:17 -0400)]
changes to integrate new/recent/browse in new session dialog.
Probably some errors/mistakes in here and no doubt some improvements to be done.
Paul Davis [Thu, 19 Sep 2013 21:34:23 +0000 (17:34 -0400)]
switch from JACK_Slave to Engine_Slave
Paul Davis [Thu, 19 Sep 2013 20:48:05 +0000 (16:48 -0400)]
reallow changing bufsize AND sample rate when we are in control, because this is cool
Paul Davis [Thu, 19 Sep 2013 20:27:03 +0000 (16:27 -0400)]
remove file (this moved to libs/backends/jack as part of the audioengine changes)
Paul Davis [Thu, 19 Sep 2013 20:17:03 +0000 (16:17 -0400)]
move configure-time dependency on PortAudio out of libs/ardour and into libs/backends/jack
PortAudio is currently used to get a list of device names for use with JACK on Windows.
We should find a better way to do this that avoids this kind of dependency.
Paul Davis [Thu, 19 Sep 2013 20:17:47 +0000 (16:17 -0400)]
missing initialization
Paul Davis [Thu, 19 Sep 2013 19:03:20 +0000 (15:03 -0400)]
show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set.
John Emmas [Wed, 18 Sep 2013 11:28:08 +0000 (12:28 +0100)]
'libs/ardour' - Further compiler specific changes
John Emmas [Wed, 18 Sep 2013 11:27:39 +0000 (12:27 +0100)]
'libs/ardour' - Further platform specific changes
John Emmas [Wed, 18 Sep 2013 11:25:36 +0000 (12:25 +0100)]
'libs/ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
John Emmas [Wed, 18 Sep 2013 09:16:40 +0000 (10:16 +0100)]
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
John Emmas [Wed, 18 Sep 2013 09:11:54 +0000 (10:11 +0100)]
'libs/ardour' - Clarify ambiguous symbols (needs to be checked)
John Emmas [Wed, 18 Sep 2013 09:03:41 +0000 (10:03 +0100)]
'libs/ardour/async_midi_port.cc' - Add a missing header file