along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <string>
#include <algorithm>
-#include <pbd/error.h>
+#include "pbd/error.h"
#include <gtkmm/menu.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/gtk_ui.h>
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
#include "public_editor.h"
#include "imageframe_time_axis.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace PBD;
using namespace sigc;
using namespace Gtk;
* @param sess the current session
* @param canvas the parent canvas item
*/
-ImageFrameTimeAxis::ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
+ImageFrameTimeAxis::ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
: AxisView(sess),
VisualTimeAxis(track_id, ed, sess, canvas)
{
_color = unique_random_color() ;
- //GTK2FIX -- how to get the group? is the canvas display really a group?
- //selection_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display), gnome_canvas_group_get_type (), NULL) ;
selection_group = new ArdourCanvas::Group (*canvas_display);
selection_group->hide();
// intialize our data items
_marked_for_display = true;
y_position = -1 ;
- name_prompter = 0 ;
/* create our new image frame view */
view = new ImageFrameTimeAxisView(*this) ;
label_view() ;
// set the initial height of this time axis
- set_height(Normal) ;
+ set_height(hNormal) ;
}
/**
iter = next ;
}
- if(image_action_menu)
- {
- delete image_action_menu ;
- image_action_menu = 0 ;
- }
+ delete image_action_menu ;
+ image_action_menu = 0 ;
- if (selection_group)
- {
- delete selection_group;
- selection_group = 0 ;
- }
+ delete selection_group;
+ selection_group = 0 ;
// Destroy our Axis View helper
- if(view)
- {
- delete view ;
- view = 0 ;
- }
+ delete view ;
+ view = 0 ;
}
//---------------------------------------------------------------------------------------//
/**
* Sets the height of this TrackView to one of ths TrackHeghts
*
- * @param h the TrackHeight value to set
+ * @param h
*/
void
-ImageFrameTimeAxis::set_height (TrackHeight h)
+ImageFrameTimeAxis::set_height (uint32_t h)
{
VisualTimeAxis::set_height(h) ;
* @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
*/
MarkerTimeAxis*
-ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
+ImageFrameTimeAxis::get_named_marker_time_axis(const string & track_id)
{
MarkerTimeAxis* mta = 0 ;
* @return the removed MarkerTimeAxis
*/
MarkerTimeAxis*
-ImageFrameTimeAxis::remove_named_marker_time_axis(std::string track_id, void* src)
+ImageFrameTimeAxis::remove_named_marker_time_axis(const string & track_id, void* src)
{
MarkerTimeAxis* mta = 0 ;