ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

advance compiling to the p*.cc point 

git-svn-id: svn://localhost/trunk/ardour2@109 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-24 17:40:10 +00:00
parent 3ff9964885
commit 04fc56bfca
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/axis_view.h
View File

@ -34,7 +34,7 @@ namespace ARDOUR {
* AxisView defines the abstract base class for time-axis trackviews and routes.
*
*/
class AxisView : public sigc::trackable
class AxisView : public virtual sigc::trackable
{
public:
/**

2
gtk2_ardour/marker_time_axis_view.cc
View File

@ -64,7 +64,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
canvas_rect->set_property ("outline_color_rgba", color_map[cMarkerTrackOutline]);
canvas_rect->set_property ("fill_color_rgba", stream_base_color);
canvas_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
_samples_per_unit = _trackview.editor.get_current_zoom() ;

22
gtk2_ardour/marker_view.cc
View File

@ -48,14 +48,14 @@ sigc::signal<void,MarkerView*> MarkerView::GoingAway;
* @param duration the duration of this item
*/
MarkerView::MarkerView(ArdourCanvas::Group *parent,
TimeAxisView* tv,
ImageFrameView* marked,
double spu,
Gdk::Color& basic_color,
std::string mark_type,
std::string mark_id,
jack_nframes_t start,
jack_nframes_t duration)
TimeAxisView* tv,
ImageFrameView* marked,
double spu,
Gdk::Color& basic_color,
std::string mark_type,
std::string mark_id,
jack_nframes_t start,
jack_nframes_t duration)
: TimeAxisViewItem(mark_id, *parent,*tv,spu,basic_color,start,duration)
{
mark_type_text = mark_type ;
@ -66,9 +66,9 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
// hook up our canvas events
frame_handle_start->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
frame_handle_end->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));;
group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_item_view_event, this), group, this));
frame_handle_start->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
frame_handle_end->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_item_view_event), group, this));
set_position(start, this) ;
set_duration(duration, this) ;

3
gtk2_ardour/mixer_strip.cc
View File

@ -1131,7 +1131,8 @@ MixerStrip::setup_comment_editor ()
comment_area.set_name ("MixerTrackCommentArea");
comment_area.set_editable (true);
comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited));
// GTK2FIX
// comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited));
// GTK2FIX
// comment_area.signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
comment_area.show ();