13
0
Commit Graph

233 Commits

Author SHA1 Message Date
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
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
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
941898843e vtl: add close/remove video menu entry 2013-03-29 12:35:57 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
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
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
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
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
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
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
341cbfbd19 reinstate the windows way for GUIIdle's but limit the scope of the connection to just the time when a long-running action is active (for now, just adding > 8 routes)
git-svn-id: svn://localhost/ardour2/branches/3.0@13654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 13:44:11 +00:00
Ben Loftis
beb3ec2d7a Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 19:43:43 +00:00
5a8e83e0de move TC FPS up into status bar, use lower right of timecode audioclock mode for something ... TBDiscussed
git-svn-id: svn://localhost/ardour2/branches/3.0@13257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-12 16:25:57 +00:00
3dcbdc0fe6 cleaner version of splash display changes
git-svn-id: svn://localhost/ardour2/branches/3.0@13004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-09 21:54:21 +00:00
47eb7ed0cc some hacks to try to get the splash to function reliably, particularly on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@13001 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-09 21:25:22 +00:00
5ba1996fd7 A (hopefully) better fix for toggle-mixer-on-top, using gtk_window_is_active() to work out whether the mixer is already on top.
git-svn-id: svn://localhost/ardour2/branches/3.0@12952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 12:21:23 +00:00
d70429a066 provide an easier way to add mixed (audio+MIDI) tracks to a session, to facilitate the use of plugins like Reaktor which accept both audio & MIDI data. there's probably still a paradigm shift waiting to happen here but its likely post-3.0.
git-svn-id: svn://localhost/ardour2/branches/3.0@12816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-22 01:45:16 +00:00
Carl Hetherington
a0cb61d411 Patch from colinf to fix problems with toggle mixer on top (#2477).
git-svn-id: svn://localhost/ardour2/branches/3.0@12714 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 21:18:00 +00:00
Rodrigo Severo
f9ed2ced4a Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not.
git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 04:21:46 +00:00
b0fdefb7af maximise-editor patch from Rodrigo:
* makes "View >> Toolbar When Maximized" act immediately, i.e., even when already maximized changing this toggle changes whenever toolbar is shown or not;
    * renames "Toolbar When Maximized" to "Show Toolbar" as it acts whenever editor has maximized space or not.


git-svn-id: svn://localhost/ardour2/branches/3.0@12668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 04:20:13 +00:00
Carl Hetherington
6624f9be37 Move delta-to-edit-point options to the main clock context menus (#4472).
git-svn-id: svn://localhost/ardour2/branches/3.0@12517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 23:14:03 +00:00
Carl Hetherington
ec1e3a1f60 Remove RemoveLastCapture action which duplicates remove-last-capture.
git-svn-id: svn://localhost/ardour2/branches/3.0@11640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-10 00:27:38 +00:00
Carl Hetherington
a7a445c044 Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-05 13:18:43 +00:00
Carl Hetherington
5e32265e27 Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11594 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-05 01:19:20 +00:00
1f0f5e89bb separate header dependencies on button joiner, and make each button joiner look up the right color for the type of buttons it contains
git-svn-id: svn://localhost/ardour2/branches/3.0@11440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:49:43 +00:00
ac268b1224 use button joiner to link play range/roll for "always play range" option. coloring and details of drawing still to be finalized
git-svn-id: svn://localhost/ardour2/branches/3.0@11437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 04:18:30 +00:00
af90dc2bae add a way to create a new MIDI track with an instrument pre-selected
git-svn-id: svn://localhost/ardour2/branches/3.0@11421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02 04:12:23 +00:00
7629120cda many changes, large and small, related to smart mode editing, range/region selection, and behaviour of playhead when always-play-range is enabled. could be buggy, but probably in subtle (or even very subtle) ways rather than obvious
git-svn-id: svn://localhost/ardour2/branches/3.0@11394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 22:53:22 +00:00
b53c92b652 the return of the splash, with a few changes to help with window layering a little
git-svn-id: svn://localhost/ardour2/branches/3.0@11222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-10 18:21:39 +00:00
20aeb5af0a move CairoWidget into gtkmm2ext, add CairoPacker, made the time info box use CairoPacker, make the info status "bar" use CairoPacker
git-svn-id: svn://localhost/ardour2/branches/3.0@10933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:57:45 +00:00
8e046a1127 restore the functionality of the join-play-range button, and remove a couple of unused controllables
git-svn-id: svn://localhost/ardour2/branches/3.0@10853 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 23:22:05 +00:00
ae09a5812b audio clocks: focus-on-clock shortcut now works, scrolling and dragging know about x-offsets; cursor colors defined; click on an off clock no longer locates (time info box)
git-svn-id: svn://localhost/ardour2/branches/3.0@10709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 16:38:51 +00:00
0eb3cbdfa1 audio clocks: big clock window now sizes itself to its current mode, all clocks pay attention to font scaling changes
git-svn-id: svn://localhost/ardour2/branches/3.0@10706 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 15:10:53 +00:00
82cd0093d6 add a signal so that if the Big Clock is closed, the edit window can grab focus back (may not be correct - should really capture close/delete signal; tweak size of audio clocks so that there is less dead space at the RHS, helps scroll wheel events to always do something
git-svn-id: svn://localhost/ardour2/branches/3.0@10700 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-19 02:36:30 +00:00
Carl Hetherington
aa38d43c69 Reset toolbar label widths on DPI change (may fix
#4433).


git-svn-id: svn://localhost/ardour2/branches/3.0@10577 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 11:31:27 +00:00
47a11efb12 put JACK time master option into Session -> Properties -> Timecode, and fully remove the time master button
git-svn-id: svn://localhost/ardour2/branches/3.0@10546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 16:42:38 +00:00
Carl Hetherington
cd2047cbff Change the feedback alert to a flashing button; works
around part of #4432.


git-svn-id: svn://localhost/ardour2/branches/3.0@10539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 13:52:27 +00:00
f96ccb1958 ardour-button-ize zoom buttons; move MIDI panic button to transport bar
git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 18:04:34 +00:00
6449c2e5c8 more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 15:25:01 +00:00
Carl Hetherington
69c88d165d Alert the user if a connection is made which causes
feedback, and preserve the route graph in the state
that it was in before the feedback was introduced. The
intent being to simplify the code, reduce the number of
areas of code which must consider feedback, and fix a
few bugs.


git-svn-id: svn://localhost/ardour2/branches/3.0@10510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-09 17:44:39 +00:00
121860f9d4 auto (return,play,input) and click buttons become ArdourButtons ("transport option button"), plus new colors from oofus
git-svn-id: svn://localhost/ardour2/branches/3.0@10506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-09 14:38:58 +00:00
f690d687d3 convert transport buttons to ArdourButton
git-svn-id: svn://localhost/ardour2/branches/3.0@10473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-07 17:23:27 +00:00
Carl Hetherington
337e010345 Allocate some thread-local buffers for the GUI thread so that the PluginEqGui impulse analysis can use them (fixes #4418).
git-svn-id: svn://localhost/ardour2/branches/3.0@10387 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-01 23:19:03 +00:00
Carl Hetherington
4d365d08c1 Use general VisibilityGroup class to manage visibility
of bits of the status bar.


git-svn-id: svn://localhost/ardour2/branches/3.0@10340 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-29 20:07:00 +00:00
Carl Hetherington
f8c6840677 Allow status bar components to be individually shown / hidden.
git-svn-id: svn://localhost/ardour2/branches/3.0@10296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-23 21:31:28 +00:00
4085309cdb make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 13:18:47 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
a5efa9a500 initial pass at session-renaming functionality
git-svn-id: svn://localhost/ardour2/branches/3.0@9876 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-14 17:41:06 +00:00