300b484cf6
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
2013-10-06 11:56:03 +01:00
7d78172abf
Miscellaneous additions to 'msvc_extra_headers'
2013-10-06 11:01:25 +01:00
df2b5c90e4
'gtk2_ardour' - In 'Note' c'tor, don't try to set 'rectangle->name' unless 'CANVAS_DEBUG' is defined
2013-10-06 11:00:10 +01:00
e93c425d6f
'gtk2_ardour' - One further Glib::usleep needed
2013-10-06 10:52:41 +01:00
7f4ed54f53
'gtk2_ardour' - Some further casting
2013-10-06 10:50:45 +01:00
2d5e605bf1
Merge branch 'audiothreads' of https://github.com/mojofunk/ardour
2013-10-04 14:00:20 -04:00
449f600c69
remove another unnecessary use of libgen.h
2013-10-04 13:02:41 -04:00
ddcb78f3e2
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least), part 2
2013-10-04 13:00:59 -04:00
028cd5660f
use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least)
2013-10-04 12:50:03 -04:00
1344014cbd
switch from MAXPATHLEN to PATH_MAX, and use <limits.h> not <sys/param.h> for portability
2013-10-04 12:46:31 -04:00
6daa7c1bc3
remove unnecessary header include
2013-10-04 12:46:02 -04:00
3aee160b19
provide PBD::demangle() even on platforms without HAVE_EXECINFO
2013-10-04 12:22:00 -04:00
74f3955682
remove OSC related cruft from ardour_ui_options.cc
...
control surface activation is handled via an entirely separate mechanism now
2013-10-04 11:46:50 -04:00
f3a22fb880
Implement JACKAudioBackend::in_process_thread
2013-10-04 18:54:54 +10:00
53ad2d187f
Move processing thread list from ARDOUR::Graph into AudioBackend implementation
2013-10-04 18:53:37 +10:00
df363a4fb3
Add AudioBackendThread class to support different thread type on windows
2013-10-04 18:51:47 +10:00
da628185b1
'gtk2_ardour' - Make sure that 'getpid()' can be found when building with MSVC
2013-10-03 09:57:25 +01:00
5da78cea9a
'gtk2_ardour' - Use 'const_iterator' where appropriate, instead of 'iterator'
2013-10-03 09:52:39 +01:00
bc2b2f9e35
'gtk2_ardour' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC
2013-10-03 09:50:34 +01:00
904367748c
'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8)
2013-10-03 09:48:19 +01:00
f763e370c5
'gtk2_ardour' - When building with MSVC, use 'std::min' + 'std::max' rather than 'fmin' + 'fmax'
2013-10-03 09:43:55 +01:00
a19afc5903
'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC)
2013-10-03 09:34:52 +01:00
8bf59e88e5
'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf'
2013-10-03 09:32:08 +01:00
bb062f2b90
'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat'
2013-10-03 09:27:40 +01:00
d7a16f7de6
'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
2013-10-03 09:12:02 +01:00
f8574fc39d
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
2013-10-03 09:06:56 +01:00
82f0f3a9a7
fix up crash caused by changes in object creation order and setting the state of the click IO object
2013-10-02 16:17:22 -04:00
d382925fba
Add a header file guard (to prevent multiple #inclusion)
2013-09-26 15:17:40 +01:00
d614dc1e18
Deliberately specify 'Gtk::manage' where necessary (avoids creating ambiguities when we #include this header file elsewhere)
2013-09-26 11:47:17 +01:00
4f4a53e870
A further change which needs to be tested on the other compilers
...
(splitting a long string into 2 x concatenated strings)
2013-09-26 11:01:15 +01:00
a88f38cf10
'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.
2013-09-26 10:58:07 +01:00
c736d88a5f
don't ping JACK server 4 times to see if it is already up when ardour starts
2013-09-25 22:56:28 -04:00
d6274d5c3e
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".
2013-09-25 18:24:32 -04:00
e43a8dac1c
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
2013-09-25 17:59:10 -04:00
70dcf7878b
Define 'suseconds_t' which isn't normally defined for Windows
2013-09-25 15:56:01 +01:00
17ad0a0b61
Merge branch 'cairocanvas' into windows+cc
2013-09-25 15:52:11 +01:00
18850253e9
only generate some current canvas debug output when CANVAS_DEBUG is defined, to quieten things down
2013-09-25 10:38:04 -04:00
67bb9a732a
add casting for MSVC sqrt
2013-09-25 10:36:42 -04:00
3ba0ef7192
fix a typo in canvas-debug.h
2013-09-25 10:36:21 -04:00
f5cd838afc
start explicitly linking against libtimecode (this needs to happen elsewhere too)
2013-09-24 22:22:43 -04:00
d0b67dce80
fix crash when cmdline provides session name
2013-09-24 22:22:16 -04:00
2c9644320f
tighten up layout of session dialog; make button say cancel or quit in difference scenarios
2013-09-23 23:13:07 -04:00
f7b6a27de6
shrink small-splash.png image by 50%
2013-09-23 23:12:42 -04:00
0f6ba422f6
use new Session API to show session SR and disk bit depth in recent sessions list
2013-09-23 21:36:13 -04:00
4209e8a834
add new static functions to get SR and disk sample format from session XML
2013-09-23 21:35:51 -04:00
cff174b541
move rate_as_string() from EngineControl to utils.cc
2013-09-23 21:35:17 -04:00
884789bfad
move announcements frame around in the session dialog and adjust spacing/borders
2013-09-23 16:49:24 -04:00
b362ff220c
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.
2013-09-23 14:41:52 -04:00
c72748508b
the output of git describe --tags is not subject to localization, so we do not need LANG= in the environment when it runs
2013-09-23 13:33:28 -04:00
f1aa5839c0
use WindowManager/WMProxy to correctly manage the audio/MIDI setup window
2013-09-22 19:22:56 -04:00
