remove method and inline its contents. Nothing gained by wrapping this up

[ardour.git] / gtk2_ardour / editor_regions.h

diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index 9679085501754b55c799b510d8bd7533bdbb9439..4b491e673dbea2e8b62254d6182034fead9db9fb 100644 (file)
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -19,9 +19,15 @@
 #ifndef __gtk_ardour_editor_regions_h__
 #define __gtk_ardour_editor_regions_h__
 
-#include "editor_component.h"
 #include <boost/unordered_map.hpp>
 
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treerowreference.h>
+#include <gtkmm/treestore.h>
+
+#include "editor_component.h"
+
 class EditorRegions : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
 public:
@@ -149,7 +155,7 @@ private:
 
        int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
 
-       void format_position (ARDOUR::framepos_t pos, char* buf, size_t bufsize, bool onoff = true);
+       void format_position (ARDOUR::samplepos_t pos, char* buf, size_t bufsize, bool onoff = true);
 
        void add_region (boost::shared_ptr<ARDOUR::Region>);
 
@@ -203,7 +209,7 @@ private:
 
        std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
 
-       typedef boost::unordered_map<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::RowReference> RegionRowMap;
+       typedef boost::unordered_map<boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::iterator> RegionRowMap;
        typedef boost::unordered_map<std::string, Gtk::TreeModel::RowReference > RegionSourceMap;
 
        RegionRowMap region_row_map;