smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-14 02:26:39 +01:00
Code Issues Projects Releases Wiki Activity
35990 commits 102 branches 144 tags 310 MiB
Commit graph

571 commits

Author SHA1 Message Date
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
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
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -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
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -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
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
1d964e27f4 prepare horizontal meters (level-meter H/V Box abstraction) 2013-08-08 15:25:40 -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
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
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -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
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
Robin Gareus
953e4aba54 prepare horizontal meters (level-meter H/V Box abstraction) 2013-07-25 14:18:39 +02: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
43f7813b24 Fix portability of Session::source_search_path 2013-07-15 08:05:37 -04:00
Robin Gareus
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
Paul Davis
580520b12f fix conflicts caused by meterbridge merge 2013-07-11 09:11:53 -04:00
Robin Gareus
b0998844db basic window infrastructure for meterbridge 2013-07-10 15:27:02 +02:00
Robin Gareus
2b0fef5933 revert 3c6ff2f0 now that WM-proxy is session-aware.. 
also includes a few additional tweaks on top of the revert:
don't set sessions to windows managed by the WM::Manager,
and also call WM::Manager's set_session (s); when closing session.
 2013-07-07 19:29:55 +02:00
Robin Gareus
3c6ff2f02f fix/workaround window-proxy session-management 
The window proxy defers construction of classes.
set_session() is called before the instances are available.
the proxy-manager only calls set_session() for SessionHandlePtr
but not the class-specific method..

fixes http://tracker.ardour.org/view.php?id=5566
 2013-07-07 04:18:23 +02:00
Paul Davis
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
Paul Davis
bedc7b170e change namespace/naming of WindowManager classes; register all ArdourDialog and ArdourWindow classes as ProxyTemporary windows so that transient-for can be set for all such windows 2013-05-07 22:09:16 -04:00
Paul Davis
a902737db9 various changes to window visibility mgmt, including use of the mixbus2 code for toggling editor + mixer windows. no longer attempt to track changes made outside of ardour, which is a lost cause 2013-05-07 13:01:26 -04:00
Paul Davis
65b6f8efad more window management rationalization 2013-05-05 16:10:54 -04:00
Paul Davis
e1b0f1bd0b merge with master 2013-05-04 22:41:10 -04:00
Paul Davis
40944574c6 the big rework of window management. probably not complete at thsi point, but this is mostly functional 2013-05-04 22:02:05 -04:00
Paul Davis
6fd66bd467 move CloseAllDialogs signal and associated method from ArdourDialog to ARDOUR_UI, and make ArdourWindow obey it too 2013-05-02 21:13:36 -04:00
Paul Davis
54bf06e63c Merge branch 'master' into cairocanvas 2013-04-26 14:20:11 -04:00
Paul Davis
db34831b18 redesign toggling of editor/mixer stacking to use Gtkmm2ext::VisibilityTracker 2013-04-26 14:12:52 -04:00
Robin Gareus
6ae4f10437 Merge branch 'master' into cairocanvas 
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
 2013-04-11 22:24:05 +02:00
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Roy Vegard Ovesen
6ef371745a non-session-manager support 
Implements open, save and dirtiness.
No error checking, no menu items disabling.
 2013-03-31 03:59:09 +02:00
Robin Gareus
941898843e vtl: add close/remove video menu entry 2013-03-29 12:35:57 +01:00
Robin Gareus
0c3e840700 videotimline 
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
 2013-03-13 20:28:15 +01:00
Paul Davis
ba73a77c63 switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a) 
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-08 16:41:45 +00:00
Paul Davis
91ff55bd89 make notice about mismatched session/ardour versions more prominent, since you can guarantee that people are going to do this after release 
git-svn-id: svn://localhost/ardour2/branches/3.0@14138 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-04 21:57:29 +00:00
Paul Davis
f08f3acbac remove EnableTranslations action, since this stuff is all done in the prefs dialog now and there is no need for a separate action to use with a menu item 
git-svn-id: svn://localhost/ardour2/branches/3.0@13979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-23 18:42:01 +00:00
Colin Fletcher
2fee2bc60c fix #5290 for 'Session|Recent' dialog as well as startup dialog. 
reinstate tooltips for collapsed rows in recent sessions too.


git-svn-id: svn://localhost/ardour2/branches/3.0@13972 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-22 18:27:13 +00:00
Paul Davis
2a2b48ef66 start passing around the (possibly-bundle-modified) localedir so that we call bindtextdomain() correctly, and thus (hopefully) find message catalogs correctly inside a bundle 
git-svn-id: svn://localhost/ardour2/branches/3.0@13965 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-21 23:14:00 +00:00
Robin Gareus
5d7ee9bbaa disclose i18n conspiracy. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13788 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-05 13:58:37 +00:00