Pan automation work. Almost, but not quite, working.

[ardour.git] / libs / ardour / session_events.cc

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index e918e0383f56897e10c5634ab1e2be0965668e7e..35c1019c0e43cb11ce6906b8be920a34b2e2216f 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
@@ -59,21 +58,21 @@ static const char* event_names[] = {
 };
 
 void
-Session::add_event (jack_nframes_t frame, Event::Type type, jack_nframes_t target_frame)
+Session::add_event (nframes_t frame, Event::Type type, nframes_t target_frame)
 {
        Event* ev = new Event (type, Event::Add, frame, target_frame, 0);
        queue_event (ev);
 }
 
 void
-Session::remove_event (jack_nframes_t frame, Event::Type type)
+Session::remove_event (nframes_t frame, Event::Type type)
 {
        Event* ev = new Event (type, Event::Remove, frame, 0, 0);
        queue_event (ev);
 }
 
 void
-Session::replace_event (Event::Type type, jack_nframes_t frame, jack_nframes_t target)
+Session::replace_event (Event::Type type, nframes_t frame, nframes_t target)
 {
        Event* ev = new Event (type, Event::Replace, frame, target, 0);
        queue_event (ev);
@@ -171,10 +170,10 @@ Session::merge_event (Event* ev)
        set_next_event ();
 }
 
+/** @return true when @a ev is deleted. */
 bool
 Session::_replace_event (Event* ev)
 {
-       // returns true when we deleted the passed in event
        bool ret = false;
        Events::iterator i;
 
@@ -203,10 +202,10 @@ Session::_replace_event (Event* ev)
        return ret;
 }
 
+/** @return true when @a ev is deleted. */
 bool
 Session::_remove_event (Session::Event* ev)
 {
-       // returns true when we deleted the passed in event
        bool ret = false;
        Events::iterator i;
        
@@ -305,14 +304,29 @@ Session::process_event (Event* ev)
        */
 
        if (non_realtime_work_pending()) {
-               immediate_events.insert (immediate_events.end(), ev);
-               _remove_event (ev);
-               return;
+               
+               /* except locates, which we have the capability to handle */
+
+               if (ev->type != Event::Locate) {
+                       immediate_events.insert (immediate_events.end(), ev);
+                       _remove_event (ev);
+                       return;
+               }
        }
 
+       //printf("Processing event: %s\n", event_names[ev->type]);
+
        switch (ev->type) {
        case Event::SetLoop:
-               set_auto_loop (ev->yes_or_no);
+               set_play_loop (ev->yes_or_no);
+               break;
+
+       case Event::AutoLoop:
+               if (play_loop) {
+                       start_locate (ev->target_frame, true, false, Config->get_seamless_loop());
+               }
+               remove = false;
+               del = false;
                break;
 
        case Event::Locate:
@@ -323,6 +337,7 @@ Session::process_event (Event* ev)
                        // cerr << "soft locate to " << ev->target_frame << endl;
                        start_locate (ev->target_frame, false, true, false);
                }
+               _send_smpte_update = true;
                break;
 
        case Event::LocateRoll:
@@ -333,6 +348,7 @@ Session::process_event (Event* ev)
                        // cerr << "soft locate to+roll " << ev->target_frame << endl;
                        start_locate (ev->target_frame, true, true, false);
                }
+               _send_smpte_update = true;
                break;
 
        case Event::SetTransportSpeed:
@@ -341,7 +357,7 @@ Session::process_event (Event* ev)
                
        case Event::PunchIn:
                // cerr << "PunchIN at " << transport_frame() << endl;
-               if (punch_in && record_status() == Enabled) {
+               if (Config->get_punch_in() && record_status() == Enabled) {
                        enable_record ();
                }
                remove = false;
@@ -350,7 +366,7 @@ Session::process_event (Event* ev)
                
        case Event::PunchOut:
                // cerr << "PunchOUT at " << transport_frame() << endl;
-               if (punch_out) {
+               if (Config->get_punch_out()) {
                        step_back_from_record ();
                }
                remove = false;
@@ -380,28 +396,20 @@ Session::process_event (Event* ev)
                del = false;
                break;
 
-       case Event::AutoLoop:
-               if (auto_loop) {
-                       start_locate (ev->target_frame, true, false, seamless_loop);
-               }
-               remove = false;
-               del = false;
-               break;
-
        case Event::Overwrite:
                overwrite_some_buffers (static_cast<AudioDiskstream*>(ev->ptr));
                break;
 
        case Event::SetDiskstreamSpeed:
-               set_diskstream_speed (static_cast<AudioDiskstream*> (ev->ptr), ev->speed);
+               set_diskstream_speed (static_cast<Diskstream*> (ev->ptr), ev->speed);
                break;
 
        case Event::SetSlaveSource:
-               set_slave_source (ev->slave, ev->target_frame);
+               set_slave_source (ev->slave);
                break;
 
        case Event::Audition:
-               set_audition (static_cast<AudioRegion*> (ev->ptr));
+               set_audition (ev->region);
                break;
 
        case Event::InputConfigurationChange: