13
0
Commit Graph

24673 Commits

Author SHA1 Message Date
1b8af985b5 fix last minute code change
git-svn-id: svn://localhost/ardour2/trunk@853 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-25 01:14:16 +00:00
ce234f363e use shared_ptr<> for all region handling
git-svn-id: svn://localhost/ardour2/trunk@852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-25 01:07:15 +00:00
7e95f29ce9 Just some whitespace fixes from where it looks like I've been working
without my editor configured correctly and haven't noticed. Sorry about
that.


git-svn-id: svn://localhost/ardour2/trunk@849 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-24 11:55:23 +00:00
3bba45c773 * [Modified] audioengine.cc
Connect to jack before we start the metering thread in case 
the connect fails and an exception is thrown.

* [Modified] SConstruct

Change back the pkg-config argument for the SoundTouch library
to the name used in the upstream tarball. Sorry drobilla, perhaps
there is a way to handle both.



git-svn-id: svn://localhost/ardour2/trunk@848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-24 11:44:06 +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
Sampo Savolainen
29d58af438 .. and make autoscrolling a bit faster.
git-svn-id: svn://localhost/ardour2/trunk@846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-23 18:34:57 +00:00
Sampo Savolainen
ba09117dfa Make canvas autoscroll work properly.
git-svn-id: svn://localhost/ardour2/trunk@845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-23 18:29:22 +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
50baf0382f Fixes for writing compliant SMF files
git-svn-id: svn://localhost/ardour2/branches/midi@843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-22 03:02:38 +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
4273f94813 fix for type error on 64 bit systems
git-svn-id: svn://localhost/ardour2/trunk@837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-17 16:56:23 +00:00
3c3a204ad3 further optimizations for multiple-track-at-once addition. as in "whoah!"
git-svn-id: svn://localhost/ardour2/trunk@836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-17 02:12:20 +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
199dce57f3 make adding multiple tracks more efficient (a *lot* more efficient)
git-svn-id: svn://localhost/ardour2/trunk@834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-16 20:22:44 +00:00
Taybin Rutkin
279128c81e Merged fix from cocoa branch -r 831.
git-svn-id: svn://localhost/ardour2/trunk@832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-16 15:58:40 +00:00
3ea92ec324 new file
git-svn-id: svn://localhost/ardour2/trunk@831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-16 14:07:58 +00:00
1ae0948138 RCU-ification of AudioEngine port list, and DiskStreams. not well tested, but basically functional. better to get this in now rather than later.
git-svn-id: svn://localhost/ardour2/trunk@828 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-16 01:19:06 +00:00
Taybin Rutkin
c5619a0f98 Renamed id to _id for ObjC compatibility.
git-svn-id: svn://localhost/ardour2/trunk@826 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-15 12:07:56 +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
Sampo Savolainen
e706680e3d Make bar lines on the canvas draw from top to bottom no matter how few
tracks are visible.

Make tracks toggle when ctrl-clicked


git-svn-id: svn://localhost/ardour2/trunk@824 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-14 19:19:06 +00:00
Sampo Savolainen
b5c9a0cfc2 Make track selection visible in track headers.
git-svn-id: svn://localhost/ardour2/trunk@823 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-14 16:19:54 +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
5dae75555e Fix initial displayed state of zoom focus selector dropbox
git-svn-id: svn://localhost/ardour2/trunk@820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-14 00:26:54 +00:00
0b572cdd84 More signal path cleanup, IO now has one deliver_output function that should do the reasonable thing in all cases.
Including deliver MIDI.

You can now create a MIDI Track, run some MIDI through it, and toggle the mute button on and off, hearing either
silence or a large amount of stuck notes depending on your luck.  Woooo.


git-svn-id: svn://localhost/ardour2/branches/midi@818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-13 03:40:04 +00:00
Hans Fugal
cf3b3205f9 Fixed ./ar{dev,dbg}
git-svn-id: svn://localhost/ardour2/trunk@817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-13 01:51:38 +00:00
Hans Fugal
81bec39eb0 less annoying debug
git-svn-id: svn://localhost/ardour2/trunk@816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 23:30:59 +00:00
Hans Fugal
b13dc9884e r268@gwythaint (orig r808): fugalh | 2006-08-12 16:31:45 -0600
r269@gwythaint (orig r809):  fugalh | 2006-08-12 16:33:00 -0600
  r321@gandalf:  fugalh | 2006-08-12 15:48:28 -0600
  Behold serialized undo.
 
 r270@gwythaint (orig r810):  fugalh | 2006-08-12 16:33:10 -0600
  r322@gandalf:  fugalh | 2006-08-12 15:49:05 -0600
  A few ardev and ardbg enhancements.
 
 r271@gwythaint (orig r811):  fugalh | 2006-08-12 16:33:20 -0600
  r329@gandalf:  fugalh | 2006-08-12 15:54:49 -0600
  Cleaning up some printf debugging
 
 r272@gwythaint (orig r812):  fugalh | 2006-08-12 16:33:38 -0600
 
 r273@gwythaint (orig r813):  fugalh | 2006-08-12 16:33:48 -0600
  r338@gandalf:  fugalh | 2006-08-12 16:30:19 -0600
  Oops, forgot one
 
 r274@gwythaint (orig r814):  fugalh | 2006-08-12 17:19:56 -0600
 Remove -x from ardbg, fix bug in memento command factory


git-svn-id: svn://localhost/ardour2/trunk@815 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 23:20:11 +00:00
Hans Fugal
92ab112480 Remove -x from ardbg, fix bug in memento command factory
git-svn-id: svn://localhost/ardour2/branches/undo@814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 23:19:56 +00:00
Hans Fugal
e0d1b7cb4b r338@gandalf: fugalh | 2006-08-12 16:30:19 -0600
Oops, forgot one


git-svn-id: svn://localhost/ardour2/branches/undo@813 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:33:48 +00:00
Hans Fugal
0cde6a54ed git-svn-id: svn://localhost/ardour2/branches/undo@812 d708f5d6-7413-0410-9779-e7cbd77b26cf 2006-08-12 22:33:38 +00:00
Hans Fugal
5d965fb582 r329@gandalf: fugalh | 2006-08-12 15:54:49 -0600
Cleaning up some printf debugging


git-svn-id: svn://localhost/ardour2/branches/undo@811 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:33:20 +00:00
Hans Fugal
3bb693a79d r322@gandalf: fugalh | 2006-08-12 15:49:05 -0600
A few ardev and ardbg enhancements.


git-svn-id: svn://localhost/ardour2/branches/undo@810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:33:10 +00:00
Hans Fugal
8ee6045cf4 r321@gandalf: fugalh | 2006-08-12 15:48:28 -0600
Behold serialized undo.


git-svn-id: svn://localhost/ardour2/branches/undo@809 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:33:00 +00:00
Hans Fugal
26e553caa8 git-svn-id: svn://localhost/ardour2/branches/undo@808 d708f5d6-7413-0410-9779-e7cbd77b26cf 2006-08-12 22:31:45 +00:00
Hans Fugal
f99a016f17 r261@gwythaint (orig r801): fugalh | 2006-08-12 15:55:04 -0600
r329@gandalf:  fugalh | 2006-08-12 15:54:49 -0600
  Cleaning up some printf debugging
 


git-svn-id: svn://localhost/ardour2/trunk@807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:01:16 +00:00
Hans Fugal
f6347b205c r260@gwythaint (orig r800): fugalh | 2006-08-12 15:53:10 -0600
r322@gandalf:  fugalh | 2006-08-12 15:49:05 -0600
  A few ardev and ardbg enhancements.
 


git-svn-id: svn://localhost/ardour2/trunk@806 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:01:08 +00:00
Hans Fugal
461b4326a1 r259@gwythaint (orig r799): fugalh | 2006-08-12 15:52:56 -0600
r321@gandalf:  fugalh | 2006-08-12 15:48:28 -0600
  Behold serialized undo.
 


git-svn-id: svn://localhost/ardour2/trunk@805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:00:57 +00:00
Hans Fugal
7f302fc8ff r258@gwythaint (orig r798): fugalh | 2006-08-12 15:50:33 -0600
The cscope and scons front-end makefile.


git-svn-id: svn://localhost/ardour2/trunk@804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:00:49 +00:00
Hans Fugal
37bfd8900c r257@gwythaint (orig r797): fugalh | 2006-08-12 15:49:20 -0600
r316@gandalf:  fugalh | 2006-08-11 17:06:48 -0600
  Reconstitution. Comiples, untested.
 


git-svn-id: svn://localhost/ardour2/trunk@803 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 22:00:34 +00:00
Hans Fugal
1f20fbbad8 merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@802 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:57:07 +00:00
Hans Fugal
8e1c9186cb r329@gandalf: fugalh | 2006-08-12 15:54:49 -0600
Cleaning up some printf debugging


git-svn-id: svn://localhost/ardour2/branches/undo@801 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:55:04 +00:00
Hans Fugal
9ff901b1e7 r322@gandalf: fugalh | 2006-08-12 15:49:05 -0600
A few ardev and ardbg enhancements.


git-svn-id: svn://localhost/ardour2/branches/undo@800 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:53:10 +00:00
Hans Fugal
81b9700c14 r321@gandalf: fugalh | 2006-08-12 15:48:28 -0600
Behold serialized undo.


git-svn-id: svn://localhost/ardour2/branches/undo@799 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:52:56 +00:00
Hans Fugal
46af8c0211 The cscope and scons front-end makefile.
git-svn-id: svn://localhost/ardour2/branches/undo@798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:50:33 +00:00
Hans Fugal
57f7f71ce3 r316@gandalf: fugalh | 2006-08-11 17:06:48 -0600
Reconstitution. Comiples, untested.


git-svn-id: svn://localhost/ardour2/branches/undo@797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 21:49:20 +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
Hans Fugal
f995ac3786 merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@794 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-12 01:36:34 +00:00
66054fe5d6 new RCU implementation, using an extra layer of indirection allowing us to use g_atomic_pointer_compare_and_exchange(); bug fix for tape tracks, not sure why this never manifested before
git-svn-id: svn://localhost/ardour2/trunk@793 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-11 23:02:08 +00:00
Taybin Rutkin
b099d2aa87 Remove unnecessary header usage.
AUPluginUI displays an empty window.


git-svn-id: svn://localhost/ardour2/trunk@792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-11 20:35:55 +00:00