0f2f4d8efc
Rewrote MidiRingBuffer to more efficiently pack data (flat pack stamps, sizes, and event data into a single buffer).
...
Eliminate a double-copy on MIDI playback (MidiRingBuffer -> MidiBuffer).
Various MIDI diskstream/source/SMF fixes (only write when appropriate, handle transport locates, etc).
Fix MIDI rec region size/offset problems.
Code cleanups.
git-svn-id: svn://localhost/ardour2/trunk@1934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-31 21:37:20 +00:00
52a8242a11
fixup botched xfade-as-audioregion; apply work from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/trunk@1933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-31 21:15:28 +00:00
539aa71d18
(MERGED FROM rev 1924 on 2.0-ongoing) fix some (all? not likely) problems with dragging close to 2^32-1 frames
...
git-svn-id: svn://localhost/ardour2/trunk@1925 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-30 03:31:49 +00:00
Doug McLain
9316ec6d44
make ARDOUR2_UI_RC work again
...
git-svn-id: svn://localhost/ardour2/trunk@1923 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-28 06:51:48 +00:00
Doug McLain
a923e78e96
add missing png files for 2 new crossfade presets per r1889
...
git-svn-id: svn://localhost/ardour2/trunk@1922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-26 16:17:53 +00:00
Doug McLain
800178bb66
Better method for redrawing gain meter pixmaps upon theme change
...
git-svn-id: svn://localhost/ardour2/trunk@1921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-26 13:47:28 +00:00
Doug McLain
e1f57ba8f0
New theme manager, with option to select between dark and light theme. Cleanups to ardours handling of the ui rc file during startup, and changed the monitoring options to be global instead of session specific. More details about the theme stuff comign to ardour-dev
...
git-svn-id: svn://localhost/ardour2/trunk@1917 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-25 20:29:12 +00:00
376c5381ed
(merge from 2.0-ongoing -r1911:1912) fix audio clock handling of key press; fix crash bug caused by mapping over a region list selection that includes rows without regions; also merge sampo's redirect undo/state fixes from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/trunk@1913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-23 00:06:16 +00:00
48d078b975
virtualize audioregion, make crossfade IS-A audioregion
...
git-svn-id: svn://localhost/ardour2/trunk@1889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-21 22:12:06 +00:00
Carl Hetherington
fd6408e6ba
Rename ARDOUR::Connection to ARDOUR::Bundle, a few minor cleanups along the way.
...
git-svn-id: svn://localhost/ardour2/trunk@1882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 15:58:01 +00:00
Carl Hetherington
452daa6371
Remove region raise() and lower(). Try to do region layering better.
...
git-svn-id: svn://localhost/ardour2/trunk@1881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 13:55:25 +00:00
e36ac4fd22
Change the return type of ARDOUR_UI::build_session to bool to indicate success/failure
...
git-svn-id: svn://localhost/ardour2/trunk@1877 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:46:33 +00:00
1ca0e752fd
Move Session::find_session into a session_utils.h header
...
git-svn-id: svn://localhost/ardour2/trunk@1865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:44 +00:00
1315ee3dff
Remove unused variable and the accessor methods for it from ARDOUR_UI
...
git-svn-id: svn://localhost/ardour2/trunk@1863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:29 +00:00
3c39771266
Rename NewSessionDialog::get_current_page to on_new_session_page
...
git-svn-id: svn://localhost/ardour2/trunk@1862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:22 +00:00
89eb386adc
Whitespace fixes in gtk2_ardour/ardour_ui.cc
...
git-svn-id: svn://localhost/ardour2/trunk@1861 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:16 +00:00
00fc7b1fa2
Use bool return type for ARDOUR_UI::unload_session to indicate success/failure.
...
git-svn-id: svn://localhost/ardour2/trunk@1860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:10 +00:00
dbb8f65d8d
Whitespace fixes in gtk2_ardour/ardour_ui.h
...
git-svn-id: svn://localhost/ardour2/trunk@1859 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:41:03 +00:00
fc6f0c837a
Whitespace fixes in gtk2_ardour/new_session_dialog.cc
...
git-svn-id: svn://localhost/ardour2/trunk@1858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 02:40:57 +00:00
Carl Hetherington
ef65fd2510
Add stacked lanes mode which displays regions on different layers at different positions in the view.
...
git-svn-id: svn://localhost/ardour2/trunk@1855 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-17 10:41:14 +00:00
696be8ea6a
tim mayberry's patches to fix middle-click pastingina couple of dialogs
...
git-svn-id: svn://localhost/ardour2/trunk@1850 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-16 02:40:55 +00:00
e6c3ff40c4
add alternate filters for soundfile browser
...
git-svn-id: svn://localhost/ardour2/trunk@1848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-16 02:21:41 +00:00
Sampo Savolainen
64b3e3be80
Make DEBUG=1 default and make ardour.sh, ardev and ardbg dump cores by default
...
git-svn-id: svn://localhost/ardour2/trunk@1843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 20:42:46 +00:00
6cf8026ac3
add new "lock position" feature for regions
...
git-svn-id: svn://localhost/ardour2/trunk@1842 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 16:16:54 +00:00
b1b02296d4
add new A/B comparison for plugins, plus ways of disabling all plugins quickly (not undoable at this time)
...
git-svn-id: svn://localhost/ardour2/trunk@1841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 14:18:02 +00:00
bac4734a13
add new A/B comparison for plugins, plus ways of disabling all plugins quickly (not undoable at this time)
...
git-svn-id: svn://localhost/ardour2/trunk@1840 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 14:13:59 +00:00
Doug McLain
20cdab6416
code readability change I forgot to add before committing, and removal of debug output
...
git-svn-id: svn://localhost/ardour2/trunk@1839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 05:09:04 +00:00
Doug McLain
9383499ce6
Add 'delta edit cursor' option to primary and secondary clocks. When in this mode, the clocks display the absolute difference between the playhead and the edit cursor
...
git-svn-id: svn://localhost/ardour2/trunk@1838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 02:48:28 +00:00
Carl Hetherington
90f3128d73
Add some comments.
...
git-svn-id: svn://localhost/ardour2/trunk@1837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 15:06:12 +00:00
7f3c381a3a
another redirect dialog fix
...
git-svn-id: svn://localhost/ardour2/trunk@1836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 13:56:52 +00:00
da285fc57d
Conditionally compile CMT additions, enabled by default.
...
git-svn-id: svn://localhost/ardour2/trunk@1833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 02:54:43 +00:00
809b64e41c
Switched some missed .get(DataType::AUDIO) -> n_audio.
...
Fixed some 8-space tabs.
git-svn-id: svn://localhost/ardour2/trunk@1832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 17:42:57 +00:00
Carl Hetherington
aa3bb18b17
Re-work main right-click context menu to operate on the selection, and remove some confusion about what region(s) will be affected by menu selections.
...
git-svn-id: svn://localhost/ardour2/trunk@1831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 11:53:35 +00:00
912fabc42d
fix up middle button mess for redirects
...
git-svn-id: svn://localhost/ardour2/trunk@1819 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 11:23:22 +00:00
0c0879ca1c
Fixed IO selector to show MIDI ports for MIDI IOs, instead of audio ports.
...
git-svn-id: svn://localhost/ardour2/trunk@1817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 04:45:38 +00:00
9a4a9cbb63
Added nicer looking wrapper methods for ChanCount::get(DataType), sedified code to use it.
...
git-svn-id: svn://localhost/ardour2/trunk@1816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 03:50:17 +00:00
7f64e5ac4c
merge changes for 2.0.1/2.0.2, plus some fixes to issues made apparent by conflicts
...
git-svn-id: svn://localhost/ardour2/branches/midi@1812 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 02:23:12 +00:00
185be4e841
fix #1637 (needs merging to 2.0.1 branch); remove debug printf
...
git-svn-id: svn://localhost/ardour2/branches/midi@1791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-07 14:13:25 +00:00
b8e9b3f071
Real fix for Jack MIDI crash. Maybe!
...
git-svn-id: svn://localhost/ardour2/branches/midi@1782 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-04 02:50:31 +00:00
c3e666867c
reintroduce use of optimized functions for gain into buffer code, and cleanup the way they are declared to avoid depending on Session
...
git-svn-id: svn://localhost/ardour2/branches/midi@1775 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-02 15:21:51 +00:00
a612857eb6
make session restore work by using explicit data types when creating new playlists ... poses question - how did this ever compile before?
...
git-svn-id: svn://localhost/ardour2/branches/midi@1774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-02 13:09:03 +00:00
0c7b7216ef
initial fixes to get build to work without new JACK MIDI, and to get it running with an older session, at least somewhat
...
git-svn-id: svn://localhost/ardour2/branches/midi@1773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-01 23:26:14 +00:00
a9e06980c1
Merged with trunk R1769... apparently. (?)
...
git-svn-id: svn://localhost/ardour2/branches/midi@1770 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-30 17:50:43 +00:00
b3fe7cfc89
Merged with trunk R1761
...
git-svn-id: svn://localhost/ardour2/branches/midi@1762 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-29 17:23:11 +00:00
490e18d80a
Merged with trunk R1736.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-22 18:01:10 +00:00
a9f5e379d2
Merged with trunk R1729.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1730 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-19 18:23:23 +00:00
bed7bacdd1
Merged with trunk R1725
...
git-svn-id: svn://localhost/ardour2/branches/midi@1729 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-18 20:36:17 +00:00
2e8f80e37a
Merged with trunk R1719.
...
Updated for Jack MIDI SVN branch (required for now).
git-svn-id: svn://localhost/ardour2/branches/midi@1720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-14 18:39:01 +00:00
959a7909c1
Merged with trunk R1705.
...
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).
git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-12 23:20:37 +00:00
0e705129fd
Merged with trunk R1622.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 07:07:38 +00:00
99904735e0
Merged with trunk R1612.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 06:07:08 +00:00
f9f5ec85fb
Merged with trunk R1393.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 17:44:13 +00:00
cd37c36326
Moved editor scrollbar to right side.
...
Fixed crash on creating MIDI tracks (MidiDiskstream::midi_playlist null deref).
git-svn-id: svn://localhost/ardour2/branches/midi@1330 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-15 20:49:10 +00:00
7701c52adb
Merged with trunk R1327.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-15 18:33:54 +00:00
32f3a4ae3e
Merged with trunk R1311.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 20:36:35 +00:00
f7563c2b15
Merged with trunk R1304
...
git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 19:50:49 +00:00
532f6aad4a
Merged with trunk R1283.
...
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 23:24:54 +00:00
ef6b25432d
Merged with trunk R1141
...
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 16:45:16 +00:00
22e41063d5
Merged with trunk R999.
...
git-svn-id: svn://localhost/ardour2/branches/midi@1000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 22:59:29 +00:00
fedf3d34f3
Merged with trunk R992.
...
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 19:01:50 +00:00
7bd41538d9
Merged with trunk R920.
...
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-19 03:29:16 +00:00
c7307c09b8
Measure line tweaks
...
git-svn-id: svn://localhost/ardour2/branches/midi@907 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-06 16:26:04 +00:00
017e16c530
Merged with trunk R879
...
git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 19:17:00 +00:00
0c3d8378f3
Adding sends/port inserts to MIDI tracks (not actually working yet though)
...
git-svn-id: svn://localhost/ardour2/branches/midi@877 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 06:59:14 +00:00
5169a66f35
Merged with trunk R874.
...
Commented out some overly verbose debug prints
git-svn-id: svn://localhost/ardour2/branches/midi@875 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 02:28:42 +00:00
5a40162026
- Fixed port adding/removing/connecting and related bugs with route signal path
...
- Minor MIDI bug fixes/cleanups
git-svn-id: svn://localhost/ardour2/branches/midi@874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 01:06:37 +00:00
82232f06ba
Merged with trunk R861
...
Possible new bugs - not very thoroughly tested, but at least functional at first glance
git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-29 21:21:48 +00:00
25d1670a61
Merged with trunk R846
...
Removed some overly verbose debug printing
git-svn-id: svn://localhost/ardour2/branches/midi@847 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-24 07:37:17 +00:00
ea71de2784
- Fixes for some recording bugs
...
- Working MIDI playback
- Various SMF fixes
- Loading of MIDI containing sessions w/o clobbering .mid files
- Varispeed MIDI fixes (still no reverse though)
- Fix for crazy rec-region sizes
- Throttled MIDI diskstream flush based on time passed (related to rec-region fix)
- Fixed playback of MIDI regions not positioned at origin (time stamp translation)
- Commented/removed old debug print statements (though some still remain)
git-svn-id: svn://localhost/ardour2/branches/midi@844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-23 04:30:57 +00:00
48a4dc072c
Recording to SMF. Playback not quite working yet, just some buglets left to iron out.
...
git-svn-id: svn://localhost/ardour2/branches/midi@841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-21 19:12:26 +00:00
7250433f50
Progress on the disk side of things:
...
- MidiRingBuffer implementation
- MidiDiskstream reading from playlists
- MidiPlaylist reading from regions
- MidiRegions returning random notes for the time being, but the inter-thread stuff works..
Horrible awful mess, not really commit worthy, but I need to move machines.
Nothing to see here.. :)
git-svn-id: svn://localhost/ardour2/branches/midi@835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-16 20:36:14 +00:00
5952c48a84
More solid "fake" recording and serialization
...
git-svn-id: svn://localhost/ardour2/branches/midi@825 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-14 23:29:01 +00:00
d752986314
- MIDI "recording" - rec region creation/drawing, actual MIDI region creation/view/pretty pictures/etc
...
- MIDI containing session saving and restoring (ie XML - Source, Region, Playlist; all but the actual .mid files)
- Numerous little fixes for audio specific stuff to accomplish the above
- Dirty hacks to accomplish the above
- Profit!!!
git-svn-id: svn://localhost/ardour2/branches/midi@821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-14 08:44:14 +00:00
a98a67120e
Merged with trunk R795
...
Fiddled with scrolling to leave a bit of context on each side. 'scroll interval' is a single float, should make it a configuration variable some day
git-svn-id: svn://localhost/ardour2/branches/midi@796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 19:43:09 +00:00
30ab1fd615
Towards MIDI:
...
- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)
Not directly MIDI related fixes for problems in trunk:
- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem). It still doesn't work, but at least it doesn't die
Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...
git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 08:20:24 +00:00
cbdf686e39
- Replaced integer port counts (and input/output maximum/minimum) with ChanCount, which can count multiple types and does the reasonable thing for all comparison operators
...
- Removed the fader/meters from MIDI mixer strips, at least until they do something
- Made the Add Route dialog refuse to create MIDI busses, Spifftacular warning dialog and all
Changes a bit more widespread than I was hoping, but worked out really well - lots of code will continue to work fine even when multi-typed (eg instrument) IOs come around, just ignoring the types it doesn't care about. Most all changes related to counts are little search/replace deals, logic doesn't need to change. Hopefully SVN can handle (automatic) merging with the other SoC projects if the buffer change goes as well.
Next step: do for buffers what the last two commits did for ports.
git-svn-id: svn://localhost/ardour2/branches/midi@787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-11 07:15:30 +00:00
30c08ba655
- Changed IO's vector<Port*>'s to PortList
...
- Added new Port classes, code to drive them
- Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage)
- Added ChanCount, though it isn't very thoroughly used yet. That's the next step....
- Fixed a few bugs relating to loading sessions saved with trunk
- Fixed a few random other bugs
Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here
Warning: Removing ports is currently (intentionally) broken due solely to laziness.
git-svn-id: svn://localhost/ardour2/branches/midi@786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-11 03:24:57 +00:00
ab6f1ed9ba
Merged with trunk R776
...
git-svn-id: svn://localhost/ardour2/branches/midi@777 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-10 01:22:45 +00:00
38c7d34d8c
Merged from trunk R745
...
git-svn-id: svn://localhost/ardour2/branches/midi@746 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-02 02:44:23 +00:00
e51e31dca2
Merged from trunk R743
...
git-svn-id: svn://localhost/ardour2/branches/midi@744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-02 00:22:16 +00:00
0565c75ce8
Merged up to trunk R732
...
git-svn-id: svn://localhost/ardour2/branches/midi@735 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-01 19:18:12 +00:00
79fc27de2e
Mostly Cosmetic/Design changes to bring trunk and midi branch closer
...
git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-01 17:19:38 +00:00
9d5d82b4df
Abstraction cleanups/polish, towards merging with trunk
...
git-svn-id: svn://localhost/ardour2/branches/midi@720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-30 03:25:38 +00:00
8277d134b9
Merged with trunk R708
...
git-svn-id: svn://localhost/ardour2/branches/midi@712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-28 01:08:57 +00:00
60454cc8dc
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and
...
associated stuff are now separated (with common things in base classes).
Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses
all look (and really are) distinct in the GUI.
git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 12:03:19 +00:00
0cdb918d4d
Work towards removal of Session's Diskstream list.
...
Havn't managed to completely remove it because of Session loading from XML - the
Diskstreams are separate from the Tracks (I assume as a throwback to when they
were distinct) so the Diskstreams need to be stored somewhere until the Tracks
are loaded. Ideally tracks should completely own their Diskstreams - not sure
how to accomplish this without breaking Session loading though...
git-svn-id: svn://localhost/ardour2/branches/midi@687 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-19 05:44:23 +00:00
50a3102b9b
Merge big changes (mostly Controllable) from trunk
...
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-14 03:43:32 +00:00
edd841895b
Loading/Saving of sessions containing MIDI tracks and/or busses
...
git-svn-id: svn://localhost/ardour2/branches/midi@667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-06 19:45:23 +00:00
22c20ab6f2
Merged with trunk, and a few trivial GUI updates etc.
...
git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-05 19:47:25 +00:00
5dc4abef79
More toolbar tweaking - Ardour fits on 1024x768!
...
git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 17:15:45 +00:00
f57bc15a6c
Complete edit toolbar overhaul
...
git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 08:03:43 +00:00
216b012e0b
A couple GUI tweaks - minor toolbar reorganization, trying to get the width down below 1024 (and make things more organized and easier to use in general). Not quite there yet....
...
git-svn-id: svn://localhost/ardour2/branches/midi@648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-28 07:08:10 +00:00
fe13d08874
Large nasty commit in the form of a 5000 line patch chock-full of completely
...
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 16:01:34 +00:00
13532c8500
Merged with trunk
...
git-svn-id: svn://localhost/ardour2/branches/midi@628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-21 18:14:45 +00:00
6a1f2919f2
Preliminary MMC sending
...
git-svn-id: svn://localhost/ardour2/branches/midi@614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-16 02:28:41 +00:00
e13e84677a
Merged with trunk revision 610
...
git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 22:31:13 +00:00
b5db1f624d
Merged with trunk revision 600
...
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 01:34:54 +00:00
868f557f26
Merged with trunk (painfully)
...
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-13 07:27:52 +00:00
74dd5bd706
Committed filthy mess of a working copy solely for moving between machines.
...
Nothing to see here, move along now...
git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-08 23:46:42 +00:00
0c1b9afc63
- Documentation fixes
...
- Fixed boolean return values in libmidi++ to return bool instead of int
git-svn-id: svn://localhost/trunk/ardour2midi@538 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-26 22:30:54 +00:00
b7757ddd70
changes to autoscroll behaviour. not perfect, but probably better
...
git-svn-id: svn://localhost/trunk/ardour2@533 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-25 20:30:32 +00:00
Sampo Savolainen
ce6c41c060
Fixed some valgrind errors from using uninitialized variables in
...
conditionals.
git-svn-id: svn://localhost/trunk/ardour2@532 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-24 22:43:15 +00:00
a7bc5ca92f
a silly change to test the commit hook script
...
git-svn-id: svn://localhost/trunk/ardour2@529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-24 19:19:19 +00:00
ff237fb64b
cleaned up main(), but partly to test the commit hook script
...
git-svn-id: svn://localhost/trunk/ardour2@528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-24 18:41:52 +00:00
11a9ea1c80
fix up formatting of SMPTE time printing in tranzport control code
...
git-svn-id: svn://localhost/trunk/ardour2@526 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-24 03:45:32 +00:00
2fba6d0925
breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces
...
git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-23 19:54:52 +00:00
Nick Mainsbridge
a222c19737
Mixer pane can be collapsed again, some cleanup, give up and go back to 'Off' for no automation playback state.
...
git-svn-id: svn://localhost/trunk/ardour2@521 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-22 11:12:26 +00:00
Nick Mainsbridge
60f5fc321b
This should fix the options editor crasher i just made.. thanks Nostar
...
git-svn-id: svn://localhost/trunk/ardour2@520 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-21 13:21:25 +00:00
Nick Mainsbridge
479ee9cc00
Mixer strip layout, emsure correct column expands on treeviews, 'Manual' automation mode labels.
...
git-svn-id: svn://localhost/trunk/ardour2@519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-21 10:11:59 +00:00
Nick Mainsbridge
f88cf52970
Fix bus rec enable bug introduced in last commit
...
git-svn-id: svn://localhost/trunk/ardour2@518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-20 09:10:13 +00:00
62b491362c
fix timestretch dialog/progress etc; make tranzport protocol non-mandatory
...
git-svn-id: svn://localhost/trunk/ardour2@517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-20 02:57:38 +00:00
9c6984dbbb
allow for mandatory control protocols, plus some ongoing work on automation control point selection (unfinished)
...
git-svn-id: svn://localhost/trunk/ardour2@516 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-19 20:10:35 +00:00
Nick Mainsbridge
c33d0ad760
Mixer strip & ui layout changes
...
git-svn-id: svn://localhost/trunk/ardour2@514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-19 17:29:05 +00:00
06654aa7f1
fix for edit & mix group names getting lost at session load
...
git-svn-id: svn://localhost/trunk/ardour2@513 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-19 01:54:00 +00:00
9a8df38ce6
add new file
...
git-svn-id: svn://localhost/trunk/ardour2@507 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-18 02:19:44 +00:00
60fbeedb5f
a) basic prototype of OSC control
...
b) various changes to ControlProtocol model/implementation
c) more attempts to get autoscroll to work nicely (unfinished)
d) move editor item types into their own header
git-svn-id: svn://localhost/trunk/ardour2@506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-18 02:19:27 +00:00
Nick Mainsbridge
b3b383faa5
Remove CannotRecordNoInput signal (allowing recording without input connections), provide visual indication of phase reverse, change e.g. 'gain automation' to 'fader automation', enforce mouse button 1 use in mixer strip, make button labels more consistent in mixer strip, disable io change/record enable when disconnected from jack on mixer strip, remove duplicated signal connections and typo in audio_time_axis.cc.
...
git-svn-id: svn://localhost/trunk/ardour2@505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-17 12:07:16 +00:00
Nick Mainsbridge
1242d9595c
Mixer strip uses button 1 where possible, make mouse click behaviour more consistent wrt popup menus.
...
git-svn-id: svn://localhost/trunk/ardour2@504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14 19:02:14 +00:00
Nick Mainsbridge
a0f60f6dd0
Don't show comments editor on the taskbar, position & resize it more sensibly and use word wrap.
...
git-svn-id: svn://localhost/trunk/ardour2@503 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14 16:01:36 +00:00
Nick Mainsbridge
3bf5ac33c5
Misc layout and useability fixes for NSD.
...
git-svn-id: svn://localhost/trunk/ardour2@502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14 08:53:28 +00:00
Nick Mainsbridge
6df830a0be
NSD bug fixes.. align text, default open and session folder directories, naming clarifications.
...
git-svn-id: svn://localhost/trunk/ardour2@501 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-12 19:51:40 +00:00
Nick Mainsbridge
2c087c2811
NSD cleanups (again).
...
git-svn-id: svn://localhost/trunk/ardour2@500 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-12 12:41:43 +00:00
Doug McLain
a0fd9fa7a0
Convert NSD from glade to gtkmm object
...
git-svn-id: svn://localhost/trunk/ardour2@499 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-12 00:30:13 +00:00
Doug McLain
f0c0ecf3b1
Convert NSD from glade to gtkmm object
...
git-svn-id: svn://localhost/trunk/ardour2@498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-11 23:44:20 +00:00
Nick Mainsbridge
1268a8ab5f
Be more sane about finding default template path.
...
git-svn-id: svn://localhost/trunk/ardour2@497 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-11 18:37:40 +00:00
Nick Mainsbridge
62198e9c27
New session dialog defaults to the 'best' templates directory, clearing template file now works.
...
git-svn-id: svn://localhost/trunk/ardour2@496 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-11 09:25:51 +00:00
Nick Mainsbridge
3732decd72
Some fixes to the new session dialog.
...
git-svn-id: svn://localhost/trunk/ardour2@495 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-10 10:22:38 +00:00
Taybin Rutkin
c67a576d61
Improved sfdb API.
...
Eliminated some warnings on Darwin.
Added libxslt to scons.
git-svn-id: svn://localhost/trunk/ardour2@494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-07 17:17:38 +00:00
Jesse Chappell
c091b877cf
brought the track/bus inspector back to life
...
git-svn-id: svn://localhost/trunk/ardour2@493 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-06 21:01:18 +00:00
5e6703c481
dmalloc link support
...
git-svn-id: svn://localhost/trunk/ardour2@491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-03 20:51:08 +00:00
979b95a56e
enable use of arrow keys, fix hscroller issues, start work on smoother auto-scroll
...
git-svn-id: svn://localhost/trunk/ardour2@490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-02 01:08:34 +00:00
Doug McLain
433c518dc7
Another GTK2 fix for timefx dialog.
...
git-svn-id: svn://localhost/trunk/ardour2@489 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-30 19:37:48 +00:00
e22a48723e
more tranzport lowlevel fixes and rebinding
...
git-svn-id: svn://localhost/trunk/ardour2@488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-29 15:40:52 +00:00
3129b822b0
make new session dialog modal.
...
git-svn-id: svn://localhost/trunk/ardour2@487 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-28 06:10:27 +00:00
982d639d44
"The In-Flight Hack, 2006"
...
a) measure lines extend the full height of the canvas
b) region name color bars and text positioning now adjusted to match
font size for different display resolutions
c) vertical scrollbar limited to cover visible tracks only
git-svn-id: svn://localhost/trunk/ardour2@486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-27 09:04:24 +00:00
Nick Mainsbridge
d2ff9e40e3
Fix vst typo
...
git-svn-id: svn://localhost/trunk/ardour2@485 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 16:33:10 +00:00
Nick Mainsbridge
d7deda2113
Fix missing commection from last commit
...
git-svn-id: svn://localhost/trunk/ardour2@484 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 16:15:26 +00:00
Nick Mainsbridge
1855ed57fd
Plugin selector useability changes, fix mouse grab bug in plugin barcontroller, prevent alpah key entry in tempo/meter dialogs
...
git-svn-id: svn://localhost/trunk/ardour2@483 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 16:04:04 +00:00
56f0a56805
fix installation and mode of ardour2 script
...
git-svn-id: svn://localhost/trunk/ardour2@482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 00:58:34 +00:00
1da9bb0c26
Install ardour as a binary, a script and a set of shared
...
libraries. Libraries are discovered via {LD,DYLD}_LIBRARY_PATH
git-svn-id: svn://localhost/trunk/ardour2@481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 00:45:27 +00:00
Taybin Rutkin
49ab3aa0b3
All included libraries now link dynamically instead of statically.
...
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.
git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 20:23:50 +00:00
Nick Mainsbridge
39f32134de
Small tempo/meter dialog useability changes
...
git-svn-id: svn://localhost/trunk/ardour2@469 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 00:51:30 +00:00
028e1ebc4a
a) completely refactor abstract UI code
...
b) single-thread Tranzport implementation
c) implement BasicUI to share functionality across multiple
controllers
d) various minor fixes here and there
git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-24 22:45:19 +00:00
Nick Mainsbridge
484debb45c
New session dialog now opens as well as makes new sessions. Avoid seeing an ugly blank editor. Some dialog tweaks.
...
git-svn-id: svn://localhost/trunk/ardour2@467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-24 21:34:23 +00:00
Sampo Savolainen
d9343ed8bd
Fix font size getter
...
git-svn-id: svn://localhost/trunk/ardour2@466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-24 15:06:20 +00:00
Nick Mainsbridge
f221ee5813
Fix my bogus glade file. sorry about that
...
git-svn-id: svn://localhost/trunk/ardour2@465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-22 17:03:28 +00:00
Nick Mainsbridge
d3a573bf3e
Set button labels sanely.
...
git-svn-id: svn://localhost/trunk/ardour2@464 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-22 16:49:51 +00:00
Nick Mainsbridge
dcd4c89f34
Prompter now prevents blank strings or unaltered names & now has a horizontal orientation. Rename marker now uses the ArdourPrompter.
...
git-svn-id: svn://localhost/trunk/ardour2@463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-22 15:28:59 +00:00
Nick Mainsbridge
f81f877adf
Fixup for comments editor blocking presses to its button
...
git-svn-id: svn://localhost/trunk/ardour2@462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-21 16:29:02 +00:00
Nick Mainsbridge
2ce07f34e2
Comments button now indicates when comments are present, more dialog work (ask about saving, comments box etc.), code cleanups in mixer_strip.cc.
...
git-svn-id: svn://localhost/trunk/ardour2@461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-20 20:41:05 +00:00