along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_visual_time_axis_h__
#define __ardour_visual_time_axis_h__
-#include <gtk--.h>
-#include <gtk-canvas.h>
-#include <gtkmmext/selector.h>
-#include <gtkmmext/popup_selector.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+
+#include <gtkmm2ext/selector.h>
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "time_axis_view.h"
-
+#include "canvas.h"
namespace ARDOUR
{
class ImageFrameTimeAxisView;
class MarkersTimeAxisView;
class TimeSelection;
-class AudioRegionSelection;
+class RegionSelection;
class MarkerTimeAxis;
class TimeAxisViewStrip;
* @param name the new name of this TimeAxis
* @param src the identity of the object that initiated the change
*/
- virtual void set_time_axis_name(std::string name, void* src) ;
+ virtual void set_time_axis_name(const string & name, void* src) ;
//---------------------------------------------------------------------------------------//
/**
* Sets the height of this TrackView to one of the defined TrackHeghts
*
- * @param h the TrackHeight value to set
+ * @param h the number of pixels to set the height to
*/
- virtual void set_height (TrackHeight h);
+ virtual void set_height (uint32_t);
//---------------------------------------------------------------------------------------//
// Selection Methods
/**
* Not implemented
*/
- virtual void set_selected_regionviews(AudioRegionSelection&) ;
+ virtual void set_selected_regionviews(RegionSelection&) ;
//---------------------------------------------------------------------------------//
/**
* Emitted when we have changed the gui, and what we have shanged
*/
- SigC::Signal2<void,string,void*> gui_changed ;
+ sigc::signal<void,const string &,void*> gui_changed ;
/**
* Emitted when this Visual Time Axis has been removed
* the destructor, this allows us to capture the source of the deletion
* event
*/
- SigC::Signal2<void,std::string,void*> VisualTimeAxisRemoved ;
+ sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ;
/**
* Emitted when we have changed the name of this TimeAxis
*/
- SigC::Signal3<void,std::string,std::string,void*> NameChanged ;
+ sigc::signal<void,const string &,const string &,void*> NameChanged ;
/**
* Emitted when this time axis has been selected for removal
*/
- //SigC::Signal2<void,std::string,void*> VisualTimeAxisRemoved ;
+ //sigc::signal<void,std::string,void*> VisualTimeAxisRemoved ;
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
* @param sess the current session
* @param canvas the parent canvas object
*/
- VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget* canvas) ;
+ VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
//---------------------------------------------------------------------------------------//
*
* @param c the new TimeAxis color
*/
- void set_time_axis_color(Gdk_Color c) ;
+ void set_time_axis_color(Gdk::Color c) ;
//---------------------------------------------------------------------------------------//
*
* @see start_time_axis_rename()
*/
- void finish_time_axis_rename() ;
-
- /**
- * Handle the (re-)displaying of the TimeAxis name label
- *
- */
virtual void label_view() ;
/** the name of this TimeAxis object */
std::string time_axis_name ;
- /** used to get a new name for this TimeAxis */
- ArdourPrompter* name_prompter ;
-
-
//---------------------------------------------------------------------------------------//
// Super class methods not handled by VisualTimeAxis
*
* @todo should VisualTimeAxis handle this?
*/
- void show_timestretch (jack_nframes_t start, jack_nframes_t end);
+ void show_timestretch (nframes_t start, nframes_t end);
/**
* Not handle by purely visual TimeAxis