Small cleanups.

git-svn-id: svn://localhost/ardour2/branches/3.0@8255 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index cd89abcc99688216307a2f95c7a23c49ab46bd11..0d63f292266561a2ea526b55b4addcc9b4b7790f 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -1074,21 +1074,16 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
                double translated_x = (*ai)->when;
                double translated_y = (*ai)->value;
                model_to_view_coord (translated_x, translated_y);
-
-               add_model_point (tmp_points, (*ai)->when, translated_y);
+               
+               tmp_points.push_back (ALPoint (
+                                             trackview.editor().frame_to_unit (_time_converter.to ((*ai)->when)),
+                                             _height - (translated_y * _height))
+                       );
        }
 
        determine_visible_control_points (tmp_points);
 }
 
-
-void
-AutomationLine::add_model_point (ALPoints& tmp_points, double frame, double yfract)
-{
-       tmp_points.push_back (ALPoint (trackview.editor().frame_to_unit (_time_converter.to(frame)),
-                                      _height - (yfract * _height)));
-}
-
 void
 AutomationLine::reset ()
 {

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 6fea1699ccd1a12460014189e9f2c79305a35a6f..c9ae5becaa9706171af5e9d192687005f5dcc6f9 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -190,7 +190,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
        void list_changed ();
 
        virtual bool event_handler (GdkEvent*);
-       virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract);
 
   private:
        std::list<ControlPoint*> _drag_points; ///< points we are dragging

diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index 570b4edbfeeff640f2228aee60fbda0f55f4885d..b17e1601f23a988e07708cc25715bed8b7bf6bf2 100644 (file)
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -20,7 +20,6 @@
 #ifndef __gtk_ardour_automation_region_view_h__
 #define __gtk_ardour_automation_region_view_h__
 
-#include "ardour/diskstream.h"
 #include "ardour/types.h"
 
 #include "region_view.h"

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 27ee2ca08670d6e4087cf6af1c59751c7521ea99..883f0449b3368f0f23d678a0099a24faeece9e1a 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -24,12 +24,8 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/midi_diskstream.h"
-#include "ardour/midi_track.h"
-#include "ardour/smf_source.h"
 #include "ardour/region_factory.h"
 
 #include "automation_streamview.h"
@@ -79,8 +75,9 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
 
        if (wfd) {
                boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
-               if (mr)
+               if (mr) {
                        mr->midi_source()->load_model();
+               }
        }
 
        const boost::shared_ptr<AutomationControl> control = boost::dynamic_pointer_cast<AutomationControl> (