Paul Davis
58eaab0e42
fix compilation
2013-10-20 09:04:27 -04:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
Paul Davis
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
John Emmas
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
Paul Davis
fa03eee79e
make the startup -> session dialog flow more sensible for brand new users
2013-10-15 12:37:13 -04:00
Paul Davis
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
John Emmas
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
John Emmas
8a4a86eff4
'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead
2013-10-14 17:05:42 +01:00
Paul Davis
be8d06f848
post a dialog about a session being opened in read-only mode (if it happens)
2013-10-12 11:58:22 -04:00
Paul Davis
b688dc802f
remove erroneous ` in string
2013-10-12 09:59:33 -04:00
Paul Davis
57262331c1
don't use a possibly non-existent window as a transient parent when showing a dialog about engine failure
2013-10-11 15:58:51 -04:00
John Emmas
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
Paul Davis
a38c0efbe7
minor tweaks to audio/MIDI setup window
2013-10-10 21:07:17 -04:00
Paul Davis
c4b20f1a20
nicely handle the (should-never-happen) case of no audio/MIDI backends being detected
2013-10-10 11:24:16 -04:00
Paul Davis
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
Paul Davis
19ba3b8de7
fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog
2013-10-08 12:18:27 -04:00
Paul Davis
5d85b5257e
use new GtkUI design in ARDOUR_UI
2013-10-07 20:27:54 -04:00
Paul Davis
d74255343e
fix up some aspects of loading from a cmdline session name
2013-10-06 16:32:02 -04:00
John Emmas
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
John Emmas
a19afc5903
'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC)
2013-10-03 09:34:52 +01:00
John Emmas
8bf59e88e5
'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf'
2013-10-03 09:32:08 +01:00
John Emmas
bb062f2b90
'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat'
2013-10-03 09:27:40 +01:00
Paul Davis
2c9644320f
tighten up layout of session dialog; make button say cancel or quit in difference scenarios
2013-09-23 23:13:07 -04:00
Paul Davis
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
Paul Davis
f1aa5839c0
use WindowManager/WMProxy to correctly manage the audio/MIDI setup window
2013-09-22 19:22:56 -04:00
John Emmas
19bb2b33a8
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
2013-09-21 09:17:25 +01:00
Paul Davis
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
Paul Davis
57d24608e7
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.
2013-09-19 15:03:20 -04:00
Paul Davis
20fa19e69e
more excision of "JACK" from labels, menu items, etc.
...
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
2013-09-17 22:25:21 -04:00
Paul Davis
fd23ebd088
Merge branch 'master' into cairocanvas
2013-09-17 21:23:30 -04:00
Paul Davis
302b08c059
Merge branch 'master' into windows
2013-09-17 21:22:56 -04:00
Paul Davis
c698ada035
change return type on {disconnect_from,reconnect_to}_engine() and make public so that we can use these when doing intentional disconnects without popping up the "HALTED" dialog
2013-09-17 21:07:14 -04:00
Paul Davis
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
Paul Davis
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
Paul Davis
c8b32e2f8b
minor fixups for audio/MIDI setup spin buttons (now editable, as they should be)
2013-09-16 22:03:59 -04:00
Paul Davis
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
Paul Davis
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
Paul Davis
ccc81f05be
remove some debug output messages
2013-09-12 17:25:01 -04:00
Paul Davis
7c88670680
lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow
2013-09-12 16:28:51 -04:00
Paul Davis
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
Paul Davis
209e4bdcae
many changes relating to session construction and audioengine interaction
...
every session member is now initialized using C++ constructor syntax
session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.
if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
2013-09-10 15:41:19 -04:00
Paul Davis
56465fda10
move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary
2013-09-09 15:17:42 -04:00
Paul Davis
bc1cc154dc
always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running
2013-09-05 14:21:25 -04:00
Paul Davis
8060198f75
change names of actions groups that include "jack"
2013-09-04 12:49:52 -04:00
Paul Davis
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
Paul Davis
e6521bb043
Merge branch 'master' into cairocanvas
2013-08-14 13:11:34 -04:00
Paul Davis
6bcdf4f0f1
fix merge issues with master
2013-08-14 13:10:59 -04:00
Tim Mayberry
de4b24b162
Move initialization of libardour from ARDOUR_UI class into main()
2013-08-13 20:15:47 +10:00
Tim Mayberry
d51eba1162
Change ARDOUR::init return type to bool type for success/failure
2013-08-13 20:15:47 +10:00
Paul Davis
da74519911
fix display of latency
2013-08-09 11:23:15 -04:00
