projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chris's work on the region list
[ardour.git]
/
gtk2_ardour
/
visual_time_axis.h
diff --git
a/gtk2_ardour/visual_time_axis.h
b/gtk2_ardour/visual_time_axis.h
index a00deba5d249f6da839b21228856523d9cc743ad..a0dfe654de246f2f12d6a57bd46f2d0faf48d36a 100644
(file)
--- a/
gtk2_ardour/visual_time_axis.h
+++ b/
gtk2_ardour/visual_time_axis.h
@@
-15,22
+15,21
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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__
*/
#ifndef __ardour_visual_time_axis_h__
#define __ardour_visual_time_axis_h__
-#include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/popup_selector.h>
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "time_axis_view.h"
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "time_axis_view.h"
-
+#include "canvas.h"
namespace ARDOUR
{
namespace ARDOUR
{
@@
-42,7
+41,7
@@
class ImageFrameView;
class ImageFrameTimeAxisView;
class MarkersTimeAxisView;
class TimeSelection;
class ImageFrameTimeAxisView;
class MarkersTimeAxisView;
class TimeSelection;
-class
Audio
RegionSelection;
+class RegionSelection;
class MarkerTimeAxis;
class TimeAxisViewStrip;
class MarkerTimeAxis;
class TimeAxisViewStrip;
@@
-85,7
+84,7
@@
class VisualTimeAxis : public TimeAxisView
* @param name the new name of this TimeAxis
* @param src the identity of the object that initiated the change
*/
* @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) ;
//---------------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------------//
@@
-94,9
+93,9
@@
class VisualTimeAxis : public TimeAxisView
/**
* Sets the height of this TrackView to one of the defined TrackHeghts
*
/**
* 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
//---------------------------------------------------------------------------------------//
// Selection Methods
@@
-105,7
+104,7
@@
class VisualTimeAxis : public TimeAxisView
/**
* Not implemented
*/
/**
* Not implemented
*/
- virtual void set_selected_regionviews(
Audio
RegionSelection&) ;
+ virtual void set_selected_regionviews(RegionSelection&) ;
//---------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------//
@@
-114,7
+113,7
@@
class VisualTimeAxis : public TimeAxisView
/**
* Emitted when we have changed the gui, and what we have shanged
*/
/**
* Emitted when we have changed the gui, and what we have shanged
*/
- sigc::signal<void,
string
,void*> gui_changed ;
+ sigc::signal<void,
const string &
,void*> gui_changed ;
/**
* Emitted when this Visual Time Axis has been removed
/**
* Emitted when this Visual Time Axis has been removed
@@
-123,12
+122,12
@@
class VisualTimeAxis : public TimeAxisView
* the destructor, this allows us to capture the source of the deletion
* event
*/
* the destructor, this allows us to capture the source of the deletion
* event
*/
- sigc::signal<void,
std::string
,void*> VisualTimeAxisRemoved ;
+ sigc::signal<void,
const string &
,void*> VisualTimeAxisRemoved ;
/**
* Emitted when we have changed the name of this TimeAxis
*/
/**
* Emitted when we have changed the name of this TimeAxis
*/
- sigc::signal<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
/**
* Emitted when this time axis has been selected for removal
@@
-146,7
+145,7
@@
class VisualTimeAxis : public TimeAxisView
* @param sess the current session
* @param canvas the parent canvas object
*/
* @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) ;
//---------------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------------//
@@
-203,7
+202,7
@@
class VisualTimeAxis : public TimeAxisView
*
* @param c the new TimeAxis color
*/
*
* @param c the new TimeAxis color
*/
- void set_time_axis_color(Gdk
_
Color c) ;
+ void set_time_axis_color(Gdk
::
Color c) ;
//---------------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------------//
@@
-221,12
+220,6
@@
class VisualTimeAxis : public TimeAxisView
*
* @see start_time_axis_rename()
*/
*
* @see start_time_axis_rename()
*/
- void finish_time_axis_rename() ;
-
- /**
- * Handle the (re-)displaying of the TimeAxis name label
- *
- */
virtual void label_view() ;
virtual void label_view() ;
@@
-249,10
+242,6
@@
class VisualTimeAxis : public TimeAxisView
/** the name of this TimeAxis object */
std::string time_axis_name ;
/** 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
//---------------------------------------------------------------------------------------//
// Super class methods not handled by VisualTimeAxis
@@
-261,7
+250,7
@@
class VisualTimeAxis : public TimeAxisView
*
* @todo should VisualTimeAxis handle this?
*/
*
* @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
/**
* Not handle by purely visual TimeAxis