projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove references to connection manager from the build.
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis_view.cc
diff --git
a/gtk2_ardour/imageframe_time_axis_view.cc
b/gtk2_ardour/imageframe_time_axis_view.cc
index a72508286373df338dac0cd22834cdae5f96db2c..a57db60a38212e137fc980bed155b391ade00b9a 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis_view.cc
+++ b/
gtk2_ardour/imageframe_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>
@@
-33,6
+32,7
@@
#include "public_editor.h"
#include "rgb_macros.h"
#include "gui_thread.h"
#include "public_editor.h"
#include "rgb_macros.h"
#include "gui_thread.h"
+#include "ardour_ui.h"
#include "i18n.h"
#include "i18n.h"
@@
-50,12
+50,12
@@
using namespace Editing;
ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
: _trackview (tv),
canvas_group (*_trackview.canvas_display),
ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
: _trackview (tv),
canvas_group (*_trackview.canvas_display),
- canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.
height
)
+ canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.
current_height()
)
{
region_color = _trackview.color() ;
{
region_color = _trackview.color() ;
- stream_base_color =
color_map[cImageTrackBase]
;
+ stream_base_color =
ARDOUR_UI::config()->canvasvar_ImageTrack.get()
;
- canvas_rect.property_outline_color_rgba() =
color_map[cImageTrackOutline]
;
+ canvas_rect.property_outline_color_rgba() =
ARDOUR_UI::config()->canvasvar_ImageTrack.get()
;
canvas_rect.property_fill_color_rgba() = stream_base_color;
canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));
canvas_rect.property_fill_color_rgba() = stream_base_color;
canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));
@@
-410,7
+410,7
@@
ImageFrameTimeAxisView::set_imageframe_duration_sec(double sec)
{
if(selected_imageframe_group && selected_imageframe_view)
{
{
if(selected_imageframe_group && selected_imageframe_view)
{
- selected_imageframe_view->set_duration((
jack_
nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
+ selected_imageframe_view->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
}
}
}
}