projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch from mantis user cth103 to fix up fixed-time cross-track drags
[ardour.git]
/
gtk2_ardour
/
marker_time_axis_view.cc
diff --git
a/gtk2_ardour/marker_time_axis_view.cc
b/gtk2_ardour/marker_time_axis_view.cc
index e08f5819519ecfbe1d87b0dc56e8875b4bd6b090..f33e0bbefc202d4ba3c67a473b65a8682d2ff3af 100644
(file)
--- a/
gtk2_ardour/marker_time_axis_view.cc
+++ b/
gtk2_ardour/marker_time_axis_view.cc
@@
-15,7
+15,6
@@
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$
*/
#include <algorithm>
*/
#include <algorithm>
@@
-52,14
+51,12
@@
MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
region_color = _trackview.color();
stream_base_color = color_map[cMarkerTrackBase];
region_color = _trackview.color();
stream_base_color = color_map[cMarkerTrackBase];
- //GTK2FIX -- how to get the group? is the canvas display really a group?
- //canvas_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(_trackview.canvas_display), gnome_canvas_group_get_type (), 0);
canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
- canvas_rect->property_x2() =
1000000.0
;
+ canvas_rect->property_x2() =
max_frames
;
canvas_rect->property_y2() = (double)20;
canvas_rect->property_outline_color_rgba() = color_map[cMarkerTrackOutline];
canvas_rect->property_fill_color_rgba() = stream_base_color;
canvas_rect->property_y2() = (double)20;
canvas_rect->property_outline_color_rgba() = color_map[cMarkerTrackOutline];
canvas_rect->property_fill_color_rgba() = stream_base_color;
@@
-201,7
+198,7
@@
MarkerTimeAxisView::apply_color(Gdk::Color& color)
* @param src the identity of the object that initiated the change
*/
MarkerView*
* @param src the identity of the object that initiated the change
*/
MarkerView*
-MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id,
jack_nframes_t start, jack_
nframes_t dur, void* src)
+MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id,
nframes_t start,
nframes_t dur, void* src)
{
if(ifv->has_marker_view_item(mark_id))
{
{
if(ifv->has_marker_view_item(mark_id))
{
@@
-347,7
+344,7
@@
MarkerTimeAxisView::set_marker_duration_sec(double sec)
{
if(get_selected_time_axis_item() != 0)
{
{
if(get_selected_time_axis_item() != 0)
{
- get_selected_time_axis_item()->set_duration((
jack_
nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
+ get_selected_time_axis_item()->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
}
}
}
}