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
Paul Davis
ab39a09b86
temporarily ignore AudioEngine::Halted when GUI asks to disconnect from JACK, to avoid warning dialog
2013-08-08 22:28:31 -04:00
Paul Davis
d90e2b4221
rationalize (a bit) engine start/stop/restart so that it is possible to start up, disconnect from JACK and then reconnect
2013-08-08 16:31:08 -04:00
Robin Gareus
4c60dd983c
vtl: import audio at video-offset, forget offset on "Remove Video"
2013-08-08 15:26:41 -04:00
Robin Gareus
9ff32d1b52
make master-meter in toolbar optional
2013-08-08 15:26:41 -04:00
Robin Gareus
d17c3207b8
add a peak reset button to the editor meter
...
see http://tracker.ardour.org/view.php?id=5601
2013-08-08 15:26:19 -04:00
Robin Gareus
8f1499664d
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-08-08 15:24:50 -04:00
Colin Fletcher
5ccd13ea78
Wrap calls to add_shortcut_folder() in try { ... } block.
...
Gtk::FileChooserButton::add_shortcut_folder() throws a Glib::Error
exception if the folder being added already has a shortcut, causing the
'New session' dialogue to appear empty when choosing 'New...' from the
Session menu. This happens if Ardour's default session folder is
set to a location that has a standard shortcut in the Gtk file chooser,
e.g. the user's home directory, desktop, &c.
Catch the exception in ArdourStartup::setup_new_session_page(), so that the
'New session' dialogue appears as expected, and likewise in
ARDOUR_UI::open_session() to avoid a similar problem there.
Fixes #5591 .
2013-08-08 15:23:11 -04:00
Robin Gareus
35fe6dfa08
NOOP - prevent headaches and remove cruft
...
Every "point zero one" seconds is only 25 Hz in ardour..
2013-08-08 15:23:08 -04:00
Paul Davis
584eeed66a
change wording in audio status when disconnected from engine
2013-08-07 22:24:30 -04:00
Paul Davis
1ab61b8564
major redesign of MIDI port heirarchy and management (part 2)
2013-08-07 22:22:11 -04:00
Paul Davis
616f2a0370
fix conflicts after merge with master
2013-08-05 14:22:32 -04:00
Paul Davis
a66e3859e1
can now start JACK based on config dialog
2013-08-05 12:51:51 -04:00
Paul Davis
7218bd91de
start work on the changes to EngineControl (dialog) to integrate with new backend design, and add "requires-driver" concept to AudioBackend to handle JACK specifically
2013-08-04 14:03:19 -04:00
Robin Gareus
68fc5bbf6c
vtl: import audio at video-offset, forget offset on "Remove Video"
2013-08-04 17:23:58 +02:00
Robin Gareus
efc46f1553
make master-meter in toolbar optional
2013-08-04 00:06:29 +02:00
Paul Davis
c2e7c32c53
add tim's jack_utils code to rationalize setup of JACK config
2013-08-03 16:37:10 -04:00
Paul Davis
1c4d00e8b7
audioengine branch can now load and run at least one test session.
...
currently hard-coded to deal only with the situation where JACK is already running
2013-08-03 11:57:56 -04:00
Robin Gareus
c06a3a6201
add a peak reset button to the editor meter
...
see http://tracker.ardour.org/view.php?id=5601
2013-08-03 13:59:22 +02:00
Paul Davis
df59a000b7
start code reorganization needed to deal with backend choices. compiles, links and runs as far as the startup screen now
2013-08-01 18:49:40 -04:00
Paul Davis
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
Paul Davis
fbfa0acebe
remove compile errors (still will not link and JACKPortEngine is not close to done)
2013-07-30 23:26:46 -04:00
Paul Davis
5e0c6af406
jack_audiobackend.cc finally compiles
2013-07-30 17:48:57 -04:00
Robin Gareus
b70057f576
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-07-24 22:04:46 +02:00
Paul Davis
3d95822716
more miscellaneous changes for audioengine, all of this is still far from actually compiling
2013-07-24 08:36:04 -04:00
Colin Fletcher
bf408d60c8
Wrap calls to add_shortcut_folder() in try { ... } block.
...
Gtk::FileChooserButton::add_shortcut_folder() throws a Glib::Error
exception if the folder being added already has a shortcut, causing the
'New session' dialogue to appear empty when choosing 'New...' from the
Session menu. This happens if Ardour's default session folder is
set to a location that has a standard shortcut in the Gtk file chooser,
e.g. the user's home directory, desktop, &c.
Catch the exception in ArdourStartup::setup_new_session_page(), so that the
'New session' dialogue appears as expected, and likewise in
ARDOUR_UI::open_session() to avoid a similar problem there.
Fixes #5591 .
2013-07-19 12:10:41 +01:00
Tim Mayberry
0444c40053
Use file modes supported by mingw compiler on Windows
2013-07-17 16:45:00 +10:00
