05baa2d1c1
use WindowManager toggle API for script-manager
2016-05-06 03:59:02 +02:00
54e01f4e48
towards fixing optional tooltips
...
Editor::parameter_changed() is not called for UIConfig changes.
"use-tooltips" was never triggered.
2016-04-27 01:06:01 +02:00
5e0f0fc9f2
lua action details (button sensitivity, text ellipsis)
2016-04-25 12:56:21 +02:00
9c622e3c99
add optional buttons to trigger lua scripted actions.
2016-04-25 00:16:08 +02:00
c07bca3a62
fix capitalization of sections of key editor
2016-03-15 21:25:07 -04:00
9a11e3a64d
change API for CairoWidget::focus_handler
...
This functor/closure is responsible for stealing focus from any existing text entry (or whatever else may have focus)
when clicking on a CairoWidget or derived class.
The old implementation just gave focus back to the editor canvas. The new version walks up the widget packing
heirarchy to find a focusable parent (from the CairoWidget for which it is invoked). If no focusable parent
is found, it cancels keyboard focus in the toplevel window containing the CairoWidget
2016-03-15 12:41:21 -04:00
c9d6d9ed85
add region & range loudnless report
2016-03-11 17:26:42 +01:00
2532911b18
Editor Actions Scripts & Manager
2016-02-23 15:42:53 +01:00
6991a07902
remove all trace of SAE from source code.
...
This had become incoherent over time, and posed a development hazard and burden going forward
2016-02-22 15:31:24 -05:00
bc487bb4b0
replicate the remove-all-trailing whitespace commit(s) in master
2016-02-22 15:31:24 -05:00
949163f806
more changes to Bindings, Keyboard APIs
2016-02-22 15:31:24 -05:00
67e19c177f
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition
...
We need this because we need binding information/objects before all
Actions have been defined.
2016-02-22 15:31:24 -05:00
1b5247ebb9
use X_() to mark binding names as non-translated
2016-02-22 15:31:23 -05:00
2c6799f247
changes to support new key bindings editor design
2016-02-22 15:31:23 -05:00
a13a8da8ac
switch all action registration/binding code over to new API.
...
This removes the ability to change bindings via menus.
Still to come: saving modified bindings, and reworking the key editor
2016-02-22 15:31:23 -05:00
d5bcf90b1a
remove all tearoffs except the monitor section.
...
We don't need this functionality anymore as we build on 15 years experience plus the new tabbed structure
2016-02-22 15:31:23 -05:00
9010262bed
first compilable version of tabbable design.
...
I would have loved to split this apart, but there are just so many interrelated changes,
it makes little sense and would be a huge effort that would break future git bisect
use because so many intermediate commits would not compile
2016-02-22 15:31:21 -05:00
3332633d19
Editing from a control surface must have the ability to ignore mouse location.
...
Add mark_in and mark_out actions that explicitly use the playhead as the edit location.
2016-01-28 13:46:33 -06:00
27d82af077
add some horz and vert zoom actions; remove some whitespace from the code of the ui-actions, so they are easier to see and maintain
2016-01-18 18:24:14 +01:00
d4aae03653
scrolling actions should not require that a track selection exists
2016-01-16 20:29:14 -06:00
André Nusser
7a846b7e6d
Make capitalization consistent and other minor spelling corrections.
2015-12-01 00:39:35 +01:00
André Nusser
4c26225ddc
Fix "Select All * Edit Point" when used as shortcut. -fixes #6626
2015-10-08 13:46:22 +02:00
22b07e0233
NOOP, remove trailing tabs/whitespace.
2015-10-05 16:17:49 +02:00
4dc63966f0
globally remove all trailing whitespace from ardour code base.
...
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
621fd845e6
Revert "add new action and loop marker menu item for setting up loop record"
...
This reverts commit ebb43508f1
2015-09-28 17:44:04 -04:00
ebb43508f1
add new action and loop marker menu item for setting up loop record
2015-09-28 17:42:11 -04:00
6b019a4953
Move UIConfiguration Singleton into UIConfiguration header
...
This removes the direct dependence on ardour_ui.h from 39 files
2015-09-16 16:55:17 -04:00
84845833c1
Add missing actions from MB2 for Mike:
...
Set-Loop-Start/End-From-Edit-Point
Set-Punch-Start/End-From-Edit-Point
2015-08-19 14:53:35 -05:00
cd92974a60
fix two oddities in strings
2015-08-13 08:56:33 -04:00
d686cb213f
Added PT .ptf session audio import functionality
...
Signed-off-by: Damien Zammit <damien@zamaudio.com>
2015-08-06 00:28:35 +02:00
b56bb944f6
Rename 'Cut time' to 'Remove time'
...
'Cut time' implies that the cut timeline items might end up on the
clipboard to be pasted somewhere: this isn't the case at present, so rename
the functions, class, &c. to say 'remove' rather than 'cut'.
Rename insert_time_dialog.{cc|h} to insert_remove_time_dialog while we're
at it.
2015-06-17 17:15:21 +01:00
e65c835381
replace tool pixel icons with vector drawing
2015-05-26 00:56:51 +02:00
3c711f1a9f
use Go To instead of Goto
2015-05-18 16:13:27 -05:00
4aace9be68
new actions: allow user to set session start and end to playhead location
2015-04-27 15:59:03 -05:00
fe6b173236
expose set-range-selection-from-region-selection operation in more places
2015-04-24 14:19:40 -04:00
84f0dceefb
Port 'Cut time' code from Mixbus
...
Copy the 'Cut time' code from Mixbus, making a few obvious fixes to work in
A3 (e.g. nframes_t => framepos_t / framecnt_t).
Seems to work to move & remove markers, tempo & meter markers, and regions on
selected tracks.
Still TODO:
- use existing A3 'Insert time' dialogue
- make it respect 'No selection = all tracks'
- rename the command to something like 'Remove time' or 'Delete time': 'Cut'
sounds to me as if the removed range should end up on the clipboard ready
to be pasted somewhere, which of course it doesn't.
2015-04-21 10:22:27 -05:00
803853b4a4
rationalize incorrect design for removing tracks.
...
Still requires a way to make this work correctly from the mixer window
2015-04-06 17:56:23 -04:00
9b457724bd
Lock, Lock & Lock
2015-04-05 02:03:53 +02:00
119bece64f
fix thinko on bounce actions
2015-03-26 22:34:30 -05:00
c7affd79c2
remove track-selection requirement so fit_selected_tracks works as coded. change name to fit-selection. remove action to zoom (both axes) because this can trivially be accomplished by clicking (f)it and (z)oom sequentially, and it frees a keybinding. remaining bug: Fitting a selection of MIDI regions doesnt work right
2015-01-11 11:46:36 -06:00
f7e3d1be2c
change Split menu entry to say Split/Separate (it was already doing that anyway). also fix a bug so you can drag the playhead and split at the playhead location
2015-01-08 16:00:49 -06:00
d9a963b07e
Show Measure Lines instead of Show Measures
2015-01-08 11:13:56 -06:00
a4f7c21ec3
now that regions and range selections are exclusive, the separate actions to set ranges or zoom to selections are redundant. save some menu entries and keybindings by consolidating them. also consolidate some code with new function get_selection_extents(). as a side-effect, this checkin fixes the assert failure in play_with_preroll
2015-01-07 15:31:30 -06:00
nick_m
884cc6f90c
Add automation track control points to undo history (and selection_op history).
2015-01-02 08:01:12 -05:00
nick_m
61315c314d
Make editor undo/redo actions sensitive at appropriate times.
2015-01-02 08:01:12 -05:00
nick_m
a795892492
Separate selection operations into their own temporary history mechanism.
...
The user can now replay *all* earlier selection operations until the next
session undo/redo command, or the completion of a new operation.
Nothing relating to selection ops is stored, and selection operation history
is begun on first idle.
Selection operation history is fundamentally different from the history of
operations which act on a selection in terms of both their viewport and the
amount of information required to replay them.
WRT undo, the user of a selection op doesn't care about the viewport state
at the beginning of an op, but rather that at the end of the previous one.
2015-01-02 08:01:12 -05:00
4c0cebf7f9
MIDI transform dialog.
2014-12-28 16:06:44 -05:00
1211278a2b
consolidate zoom-to-range and zoom-to-regions into: zoom-to-selection. ToDo: zoom to selection of midi notes, control points, tracks(?)
2014-12-22 17:42:43 -06:00
64fa63212f
move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration
2014-12-22 13:39:46 -05:00
5fef655380
Remove internal edit mode and add "content" tool.
2014-12-18 20:21:01 -05:00
e66752cec1
add set-session-extents-from-edit-range
2014-12-09 16:18:47 -06:00
603748d68a
Unify gain and draw tools.
...
There might be a few special cases lingering around from attempts at magic tool
business, but this seems to work fine as far as I can tell.
2014-12-07 20:37:46 -05:00
bfbb0f6178
Add legatize and remove overlap MIDI operations.
...
We're going to need the ability to apply MIDI edit operations to a note/control
selection soon...
2014-12-06 23:42:11 -05:00
6b3a8915f3
add abort() to non-reached code
...
This cleans up a lot of false-positives in static analysis
and also helps compilers to optimize code paths in general.
(tagging the fatal stingstream operator as ‘noreturn’ is
far less trivial)
2014-11-14 11:30:08 +01:00
b73f725676
remove mouse zoom mode; bind z to zoom-to-range
2014-10-21 12:47:53 -04:00
44f71ce599
Text tweaks and typo fixes
2014-10-02 18:03:19 +01:00
e9ab53402c
add action and menu item to control use of skip playback
2014-09-17 12:28:36 -04:00
564d8d7669
Consistent styling for toolbar buttons.
...
All the different looks here didn't seem to convey anything useful to me, and
looked sloppy. I went with the style of the transport button.
It would be nice if we could style button elements like Inset in the
configuration, but this would require some work.
2014-07-29 23:39:01 -04:00
3876b48879
Add track-rec/mute/solo actions to menu, so users can bind them
...
Make Fit-Tracks sensitive to track selections
2014-07-24 15:47:05 -05:00
b22e136887
Add some new zoom-to-selection actions, so zoom tool is less needed.
...
Reverse order of items in the zoom menus to match Ardour.
Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-07-23 11:31:06 -05:00
62cab525f0
(Mixbus profile only) tentatively remove the Zoom and Cut tools, to save space in the toolbar and reduce some highly redundant functions
2014-07-14 10:08:55 -05:00
b19e1a7985
remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group)
2014-07-14 10:08:55 -05:00
07e0f785f8
add "fade range" operation, bound to alt-f at present by default
2014-07-10 08:17:22 -04:00
fcabd5d8ee
initial implementation of "bring all media into session folder". Incomplete but basically functional for audio files
2014-07-08 00:53:13 -04:00
7ec397c019
add basics of Cut mouse mode, no functionality yet. Icon images are still required
2014-07-07 07:05:43 -04:00
6d97d72999
remove some cruft with previous commits. remove option link-region-and-track-selection since they are now exclusive, and rename select-all-regions to select-all-objects to match the implementation
2014-07-06 14:02:13 -05:00
db60bc86b8
now that track and region selections are mutually exclusive, you need a separate action to select-all-tracks and select-all-regions. also, preserve region selection during a split, iff we are working on a region selection: only add the newly created regions, dont change anything else in the selection; leave that in control of the user
2014-07-06 12:57:36 -05:00
c771668f9a
Q and W jump between markers. this puts them right next to Tab which creates and deletes markers. numpad left/right arrows are an alternate action for this
2014-07-06 07:02:11 -05:00
e083deff83
rename the action that cycles through edit modes, since there are more than two
2014-07-04 07:49:46 -04:00
555a5d6348
lots of keybinding changes. added a new action to allow removing markers at the playhead location. numpad now allows you to access marks higher than 9. to locate to a marker, use the numpad decimal to start and end the operation - for example press .19. to locate to marker 19. also added alternate bindings for redo, delete, and several other alternates that will be needed in subsequent commits. tab is not working, using either Tab or nabla in the binding.in file
2014-07-03 17:50:14 -05:00
0f1c7b1d71
start-range and finish-range should graphically show the range being created. also add bindings for comma and period in addition to existing bindings which require a numpad. the old ones are now alternates. all primary functionality should appear on the qwerrty, and the numpad should be considered an ergonomic redundant alternative if you have one
2014-07-02 17:35:37 -05:00
190542c1d0
splice mode is undefined, undocumented, and buggy. ripple does most of what we want. remove splice for now. leave code because it may be revived later
2014-07-01 16:43:00 -05:00
e5e12acc56
Merge branch 'ripple-mode-cc' into cairocanvas
...
Fix up merge conflicts in
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
Also fix up compile errors.
2014-07-01 19:10:47 +01:00
a3c378cf62
move utility functions into a dedicated namespace
2014-06-25 21:47:54 +02:00
cd12698b9c
Rename PBD::find_file_in_search_path to just PBD::find_file
...
saves a bit of typing and not necessary if you look at how it is used.
2014-06-25 12:40:10 -04:00
f147846863
add ability to save current action sensitivities and restore them, and to disable all action sensitivity.
...
This is needed to be able to lock the application fully on OS X, where the global menu bar would still allow interaction
even when a modal dialog is displayed.
2014-06-24 09:56:16 -04:00
d75c7151d4
Ripple mode: basic implementation
...
Add a value for Ripple to EditMode enum.
Add Ripple edit mode to edit mode dropdown, by adding it to the
Editor::build_edit_mode_menu() helper function, and remove the old code that
added items to the (now unused) Editor::edit_mode_strings.
Add the regions that should be affected by the drag to RegionDrag::_views so
that the drag carries them along automatically.
Use a copy of the RegionList in Playlist::core_ripple(), since bad things
happen when iterating over regions and they get moved around in the list.
Handle rippling in removal of regions from playlist.
When dragging in ripple mode, exclude all regions that lie before the
original start position of the selected regions being dragged from
rippling: this is what Mixbus does.
Make editor dragging respect snap-to settings, by using the existing
compute_x_delta() function, which did almost the right thing. Move setting
of _last_frame_position out of that function so all ripple-dragged regions
can move.
Ripple when dragging from region list: even though Mixbus doesn't do this, it
seems like a good idea.
Prevent multi-track selection being dragged across tracks, by making
RegionMotionDrag::y_movement_allowed() virtual, and overriding it in
RegionRippleDrag to forbid dragging of selections containing regions on more
than one track to dofferent tracks in ripple mode.
Remember which TimeAxisView a ripple-mode drag that's allowed cross-track
drags started from, so that the effect of rippling regions after any region
that's dragged off that track can be undone.
2014-05-07 19:46:24 +01:00
302fd7efeb
correctly set up ruler preferences for get_trx() == true case
2014-05-01 07:53:28 -04:00
38125d60c9
"sequence regions" operation (remove space between selected regions) added, c/o Thomas Brand
2014-04-29 00:11:05 -04:00
509159c3c6
first pass hiding/rearrangement of UI elements related to trx
2014-04-10 13:30:25 -04:00
4c2e846126
the FlatFace element is no longer relevant. instead it was being used for an inset jeweled look. changed name to match
2014-03-26 11:37:28 -05:00
harrison
b9708d5f6b
New theme for editor window using ArdourMenu
2014-03-23 18:11:42 -05:00
bf0157a0f2
the forgotten second (amend to prev commit)
2014-02-25 12:01:14 -05:00
e3529b3b11
fix prev_snap_choice() key="3" binding
2014-02-25 12:01:13 -05:00
d00dc6a706
various work to make loop/punch display work better (including fixes for bugs present in master also)
2014-01-27 21:27:13 -05:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
d7e336e0f2
s/Framenumber/Frame number/
2013-06-14 00:41:02 +02:00
6b480bb2f7
vtl: make "Remove Video" insensitive if N/A
2013-06-13 00:58:19 +02:00
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
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
1040801ffe
vtl: video-monitor letterbox & orig-zoom to menu
2013-04-04 01:05:49 +02:00
9301991f6e
vtl: video-monitor interaction
...
* Menu > View > Video Monitor -- bi-directional communication
with xjadeo for window-state and OSD.
* fix saving state on session close (wait for xjadeo to terminate)
2013-04-03 22:29:37 +02:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
5da4e2be2d
remove timecode subframe configuration
...
There is no actual use-case to set it to anything else than 100.
timecode subframes are only used for ruler marks and the snap to grid.
libtimecode is still /aware/ of the subframe setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@13817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-09 15:47:19 +00:00
1224fc0700
add cycle-zoom-focus and bind to "1" by default
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 16:20:37 +00:00
93b3a72cb8
remove debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 21:03:19 +00:00
7b121f301c
locale/focus debug 3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 20:43:06 +00:00
Ben Loftis
92e5a13fd4
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 20:48:44 +00:00
Ben Loftis
e63da83c53
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 22:43:10 +00:00
38c10a4d23
make range ruler visible by default - costs a few mm, saves confusion among new users
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13536 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 14:03:09 +00:00
60f85cac42
provide the ability to enable + disable tooltips
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-14 23:23:53 +00:00
3fa84d0caa
add alt-i as a binding in both the editor and mixer windows to toggle the state of MIDI input on the selected track(s); in the mixer this will also operate on the strip under the mouse. fixes #4838
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:19:04 +00:00
e43d91949b
more work on RID and editor/mixer order matching; when a track/bus is hidden in the GUI controlling RID, it gets a extremely large RID to prevent it showing up on a control surface (but ... for now ... is still visible in the other GUI, even if "sync order between mixer + editor" is enabled); change font in editor route list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-19 22:35:43 +00:00
dd440c22c1
rename MIDI "Fork" operation to "Unlink from other copies"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-17 14:10:45 +00:00
Carl Hetherington
25e5bfd17e
Rename Editor::duplicate_dialog to Editor::duplicate_range
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:31:06 +00:00
1f440fbfec
Remove unused or unnecessary header includes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:51 +00:00
105caf23da
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
f1505b631d
substantive change to try to provide some rationality for region gain line visibility (and automation line visibility in general
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 18:30:10 +00:00
6fa6514cfd
Remove over 500 unnecessary includes (including 54 of session.h).
...
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff). I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.
This commit only targets includes of ardour/*.h. There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.
git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
813c5f0af9
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
...
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
Carl Hetherington
e932cc7179
More tweaks to naming some actions ( #4879 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12319 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-17 11:02:42 +00:00
Carl Hetherington
c3508622f4
Use Later / Earlier in descriptions of nudging and some playhead movements, instead of Forward / Backward ( #4879 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 23:03:47 +00:00
Carl Hetherington
a2897ecef6
Fairly major change to the way in which crossfades are handled;
...
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.
If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 16:32:22 +00:00
8b03f1790a
fix twice-used name "Editor" for action group
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11706 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-16 16:50:35 +00:00
Ben Loftis
b4999fbc14
remove menu items from the keybindings dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-12 19:24:16 +00:00
b02e95f201
make region gain line visibility global, not per-region
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-15 14:03:19 +00:00
ed62609e80
support a grid of beats/64 and beats/128
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-14 22:15:25 +00:00
671ec99bac
(1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-13 14:34:21 +00:00
c21c9e6662
use button joiner for smart mode; polish up the visuals on the joiner a bit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:31:10 +00:00
2d015c0610
MIDI event list editor improvements, mostly to do with nagivation, but also edits are now applied across all selected notes. getting close to calling this done for 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 20:11:57 +00:00
f3624c1874
exit internal/note edit mode when clicking on anything that is not a MIDI region view or a note (or various modeless items like markers and the playhead)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11333 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:20:31 +00:00
24978033ef
tweak up the region context menu quite a bit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11285 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 15:53:41 +00:00
efab36a85e
new mouse mode (Draw (notes)); switch into internal mode when draw is selected; notably improve use of dbl-click to enter and exist internal/note edit mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 15:23:51 +00:00
976e163406
make insert-patch-change from context menu use context click event for position ( fixes #4570 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 01:50:34 +00:00
75a3964c10
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588 , mostly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:38:56 +00:00
96ae97ddcb
preparations for using ardour's own keybinding system for the editor (not actually used)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 15:29:53 +00:00
Carl Hetherington
23964284a4
Hopefully fix some i18n bugs ( #3565 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
Carl Hetherington
357faa72fb
Fix capitalisation.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10736 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:33:41 +00:00
Carl Hetherington
9355226fdf
Use the word Remove consistently for the remove regions
...
action, instead of the word Delete in the menu item and
Remove elsewhere.
git-svn-id: svn://localhost/ardour2/branches/3.0@10622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 18:32:42 +00:00
Carl Hetherington
1362ac2046
Ellipsis on Quantize option.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 13:44:13 +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
bd1d705498
add new editor actions for solo, mute, solo-isolate toggle (of selected tracks) for use by MIDI bindings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9990 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-14 16:01:07 +00:00
a82b900e44
implement a delete operation that works like "cut" but doesn't put the deleted items in the cut buffer. you will not be able to access this from your keyboard (Delete keyunless you remove your existing ~/.config/ardour3/ardour.bindings file
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 15:50:47 +00:00
b27a3d99ac
Remove "smaller" track height (basically just a broken version of small anyway).
...
Remove no-longer-necessary cruft related to non-editable track names (which do not exist).
Fix smallest height to be correctly padded (just large enough to hold the button row without ugly clipping).
Fix resizing of tracks when renaming (issue #4075 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@9665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 00:06:35 +00:00
ed626628b5
Delete trailing whitespace
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
f87baef1e7
somewhat illogical and temporary workaround to the problems with consolidate & bounceable. it turns out that region bouncing never replaces the in-place region, so bounceable() doesn't matter; range bouncing only needs to check bounceable() if we're going to replace material in place and the op is with-processing. reword the error dialog too
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-27 01:04:56 +00:00
9c733915a0
basic uncombining (no post-facto region trimming)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9566 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 16:11:00 +00:00
99aa8c6338
rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 20:16:57 +00:00
0a9cef7720
very basic Join (regions) editing operation. not finished yet, no undoable, no sensible name for new region, etc. etc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 02:17:58 +00:00
Carl Hetherington
ac2689f661
Remove delete menu item which does the same as cut ( #3930 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 10:44:36 +00:00
Carl Hetherington
77d5a80155
Fix radio action registration thinko of my doing. Fixes #3986 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-18 13:41:32 +00:00
Carl Hetherington
80abf7693e
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-17 13:55:41 +00:00
Carl Hetherington
e8c8befb87
Differentiate between pitch-shift (for audio) and transpose (for MIDI). Fixes #3940 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 02:04:37 +00:00
Carl Hetherington
ebb31e504b
Rename Transpose to Pitch Shift to correspond with its dialogue box.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 02:04:00 +00:00
Carl Hetherington
59b54e167f
Fix typos (part of #3939 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 00:31:38 +00:00
Carl Hetherington
b850f58467
Fix center_edit_point action name.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-03 23:50:30 +00:00
Carl Hetherington
1ec69a3b70
Fix Transport->Play->Play option name, and rename Play Selection to Play Selected Range (part of #3927 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9274 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-03 20:57:04 +00:00
Carl Hetherington
58f386961b
Use some helper functions to trim some lines. There should be no functional changes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-03 20:56:52 +00:00
Carl Hetherington
488d54a341
Remove action-driven keyboard brush, which is the same as paste as far as I can see.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 17:02:09 +00:00
786028a20a
make fit-selected-tracks operate on tracks with selected regions IF no tracks are selected
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9026 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 02:46:19 +00:00
Carl Hetherington
50858919d3
Clean up Misc. Shortcuts menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9025 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 02:15:16 +00:00
Carl Hetherington
3b84c96017
Remove some unused code, and Editor::get_prefix() which wasn't doing anything.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 00:30:28 +00:00
Carl Hetherington
115a150470
Make track shrink / expand bindable actions ( #3695 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9017 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 23:25:55 +00:00
7a5b6a5031
patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-14 21:49:43 +00:00
314f0d91d3
a radically new approach to sizing the track header layout that now allows ardour to shrink dramatically in vertical height. current lower limit is about 763 pixels WITH the editor mixer strip, and something much, much smaller without it
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 14:48:59 +00:00
Carl Hetherington
58b207b190
Rename Frames ruler to Samples.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 12:51:02 +00:00
Carl Hetherington
756ffc26bf
Tidy up the ruler code slightly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 01:16:05 +00:00
Carl Hetherington
5b8472314e
Add option to show or hide zoom toolbar.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-03 03:11:31 +00:00
Carl Hetherington
f8ebb4582d
Unify program change and bank handling so that they are manipulated together.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8346 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-28 18:19:40 +00:00
Carl Hetherington
818f2cffd7
Add menu option to insert program changes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8330 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 23:45:04 +00:00
Carl Hetherington
a5ea47ff0d
Re-expose timecode offset in the session option editor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-01 20:49:22 +00:00
8b68ed57ec
Fix some messed up code (spacey tabs).
...
(There is faar more of this... FIX YOUR EDITORS!)
git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 20:37:39 +00:00
Carl Hetherington
1a9bd134d2
Fix crash on opening region menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 16:49:25 +00:00
Carl Hetherington
ba8b84eed1
Option to show lines below markers ( #3529 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 18:29:32 +00:00
Carl Hetherington
56fd4f8e76
Restore trim-to-{previous,next}-region.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-04 01:58:09 +00:00
Carl Hetherington
b5ab2e030b
Tidy up the region menu a bit, and hopefully clarify what regions will be
...
operated on in different circumstances. Make the main menubar Region menu
the same as the context one, and use the same logic to sensitize/desensitize
actions for them.
git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 22:19:29 +00:00
Carl Hetherington
096f146d94
Tidy up Window menu a bit; use ToggleActions for all relevant things, cleanup editor/mixer options a bit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7828 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-22 00:41:25 +00:00
Carl Hetherington
620a4df730
Save / restore settings from the editor region list context menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-19 02:18:59 +00:00
Carl Hetherington
579fcb70e2
First go at saving window visibility and position state across saves.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-18 02:20:15 +00:00
Carl Hetherington
35cd944f40
Add Beat/20 grid subdivision. Fixes #3126 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7627 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-15 10:33:31 +00:00
Carl Hetherington
5524e377a2
Add shortcut for link object/range mode. Fixes #3242 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7619 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 16:50:15 +00:00
2f9184d653
beat slicing patch #1 from lincoln spiteri
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 11:33:27 +00:00
Carl Hetherington
e3b0cb086d
Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 00:35:53 +00:00
ec01a25ec1
add 8 more beat subdivisions, as per #3126
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-13 18:51:59 +00:00
Carl Hetherington
6f3de51ed3
Copy-edit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 00:34:29 +00:00
Carl Hetherington
7e6014a077
Fix track height menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 00:09:41 +00:00
Carl Hetherington
1b9bf21aa4
A little copy-editing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 23:54:25 +00:00
Carl Hetherington
7fc2e8da30
Fix toggling behaviour of glue region to bars & beats option. Fixes #2588 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7040 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 14:08:37 +00:00
Carl Hetherington
7df6278865
Tidy up rhythm ferret dialogue a bit and move its menu option into the Region menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7029 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 13:29:14 +00:00
Carl Hetherington
30aad22680
More copy-edit tweaks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7026 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 01:29:52 +00:00
Carl Hetherington
0cde999d87
Move toggle-waveforms-while-recording into RC options.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 01:40:42 +00:00
Carl Hetherington
4493d639e6
Fix menu item text corrupted by search & replace.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 00:05:06 +00:00
Carl Hetherington
d1624f9ed2
Take away the Remove option from the region list, and add Show to re-show hidden regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-31 01:11:48 +00:00
6ef5d85ae1
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 15:33:04 +00:00
ce7a5e1c9f
the Properties & 64bit region commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 13:59:49 +00:00
cf32bf81b8
Move object+range button up with the rest of the tool buttons (bringing edit toolbar back to correct height).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 03:17:02 +00:00
b5148d93d5
Add keyboard shortcut to tooltip text where possible.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 00:50:24 +00:00
b48e221484
Add tooltips for link buttons.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 21:20:51 +00:00
832aa18a81
a boatload of minor and middle-sized changes to try to speed up undo. imperfect, unfinished, but probably right to commit now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 20:34:09 +00:00
Carl Hetherington
cb8bc93ea3
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-14 01:04:27 +00:00
Carl Hetherington
1a1edc9ca1
Make a new action "escape", bound to the Escape key, and make it
...
abort a drag (if one is in progress) or clear the selection.
Fix breaking of drags in a few cases; some still to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@6467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-08 01:28:15 +00:00
Carl Hetherington
f5acf93672
First cut of some Pro-tools inspired editing features; linked play/play range
...
and linked object/range modes.
git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 22:11:15 +00:00
Carl Hetherington
e8e63d8eac
Fix show/hide of editor summary.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:13:06 +00:00
f6fdd8dcbf
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
8687895abb
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 15:02:15 +00:00
64dc5427e4
make all use of bind/mem_fun be explicitly sigc::
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 23:29:48 +00:00
Carl Hetherington
8b9b4308e0
Clean up some confusion about zoom focus and the edit point.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6261 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 23:31:02 +00:00
