86343b6c15
merge with master, primarily for adrian's maximise-mixer change
2014-03-22 10:58:26 -04:00
Adrian Knoth
5f45828c67
Add option to display the mixer in fullscreen
...
This is useful for dual-head setups.
2014-03-21 16:08:53 +01:00
543099afba
rework SystemExec - use vfork wrapper (and lots of related stuff)
2014-03-13 16:58:07 +01:00
ba0ae4818a
[VST] scan timeout display and per plugin timeout override.
2014-03-09 20:32:52 +01:00
d8329d855d
implement plugin-scan cancel-button sensitivity
2014-02-25 14:57:59 +01:00
6471c94254
hook-up GUI idle handler
2014-02-25 14:57:58 +01:00
22905d8a93
prepare GUI notifications for plugin scan
2014-02-24 02:04:37 +01:00
1d39cf7543
move SystemExec to libpbd
2014-02-19 03:38:43 +01:00
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
nick_m
be69bf15dd
New routes are placed after highest selected route.
2013-10-24 01:27:13 +11:00
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
28525d7b69
Forward declare NSM_Client class in ardour_ui.h
...
nsm.h pulls in winsock2.h and with the mingw build and it causes endless
warnings from the compiler
2013-10-21 10:10:40 +10:00
b540d0e4bc
Fix check button handling in Memory Warning Dialog
2013-10-21 10:10:40 +10:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
98880915af
'gtk2_ardour' - Add some further header files to satisfy MSVC build
2013-10-14 17:14:23 +01:00
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
5d85b5257e
use new GtkUI design in ARDOUR_UI
2013-10-07 20:27:54 -04:00
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
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
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
f1aa5839c0
use WindowManager/WMProxy to correctly manage the audio/MIDI setup window
2013-09-22 19:22:56 -04:00
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
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
fd23ebd088
Merge branch 'master' into cairocanvas
2013-09-17 21:23:30 -04:00
302b08c059
Merge branch 'master' into windows
2013-09-17 21:22:56 -04:00
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
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
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
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
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
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
ab39a09b86
temporarily ignore AudioEngine::Halted when GUI asks to disconnect from JACK, to avoid warning dialog
2013-08-08 22:28:31 -04:00
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
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
1d964e27f4
prepare horizontal meters (level-meter H/V Box abstraction)
2013-08-08 15:25:40 -04:00
8f1499664d
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-08-08 15:24:50 -04:00
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
616f2a0370
fix conflicts after merge with master
2013-08-05 14:22:32 -04:00
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
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
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
953e4aba54
prepare horizontal meters (level-meter H/V Box abstraction)
2013-07-25 14:18:39 +02:00
b70057f576
add [master] meter to the toolbar
...
http://tracker.ardour.org/view.php?id=5601
2013-07-24 22:04:46 +02:00
43f7813b24
Fix portability of Session::source_search_path
2013-07-15 08:05:37 -04:00
bd9e2737b7
NOOP - prevent headaches and remove cruft
...
Every "point zero one" seconds is only 25 Hz in ardour..
2013-07-11 20:39:23 +02:00
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
b0998844db
basic window infrastructure for meterbridge
2013-07-10 15:27:02 +02:00