ardour/livetrax
13
0
Fork 0
Code

Fix time canvas separator lines.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1994 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-06-16 23:55:23 +00:00
parent 0df86069c7
commit a7ad624392
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ardour.rc.in
View File

@ -79,6 +79,7 @@
<Option name="location punch" value="7c3a3aff"/> <Option name="location punch" value="7c3a3aff"/>
<Option name="verbose canvas cursor" value="f4f214bc"/> <Option name="verbose canvas cursor" value="f4f214bc"/>
<Option name="marker label" value="000000ff"/> <Option name="marker label" value="000000ff"/>
<Option name="marker bar separator" value="30303088"/>
<Option name="tempo bar" value="72727fff"/> <Option name="tempo bar" value="72727fff"/>
<Option name="meterbar" value="666672ff"/> <Option name="meterbar" value="666672ff"/>
<Option name="markerbar" value="7f7f8cff"/> <Option name="markerbar" value="7f7f8cff"/>

10
gtk2_ardour/editor_canvas.cc
View File

@ -705,19 +705,19 @@ Editor::color_handler()
verbose_canvas_cursor->property_fill_color_rgba() = Config->canvasvar_VerboseCanvasCursor.get(); verbose_canvas_cursor->property_fill_color_rgba() = Config->canvasvar_VerboseCanvasCursor.get();
meter_bar->property_fill_color_rgba() = Config->canvasvar_MeterBar.get(); meter_bar->property_fill_color_rgba() = Config->canvasvar_MeterBar.get();
meter_bar->property_outline_color_rgba() = Config->canvasvar_MeterBar.get(); meter_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
tempo_bar->property_fill_color_rgba() = Config->canvasvar_TempoBar.get(); tempo_bar->property_fill_color_rgba() = Config->canvasvar_TempoBar.get();
tempo_bar->property_outline_color_rgba() = Config->canvasvar_TempoBar.get(); tempo_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
marker_bar->property_fill_color_rgba() = Config->canvasvar_MarkerBar.get(); marker_bar->property_fill_color_rgba() = Config->canvasvar_MarkerBar.get();
marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBar.get(); marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
range_marker_bar->property_fill_color_rgba() = Config->canvasvar_RangeMarkerBar.get(); range_marker_bar->property_fill_color_rgba() = Config->canvasvar_RangeMarkerBar.get();
range_marker_bar->property_outline_color_rgba() = Config->canvasvar_RangeMarkerBar.get(); range_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
transport_marker_bar->property_fill_color_rgba() = Config->canvasvar_TransportMarkerBar.get(); transport_marker_bar->property_fill_color_rgba() = Config->canvasvar_TransportMarkerBar.get();
transport_marker_bar->property_outline_color_rgba() = Config->canvasvar_TransportMarkerBar.get(); transport_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
range_bar_drag_rect->property_fill_color_rgba() = Config->canvasvar_RangeDragBarRect.get(); range_bar_drag_rect->property_fill_color_rgba() = Config->canvasvar_RangeDragBarRect.get();
range_bar_drag_rect->property_outline_color_rgba() = Config->canvasvar_RangeDragBarRect.get(); range_bar_drag_rect->property_outline_color_rgba() = Config->canvasvar_RangeDragBarRect.get();

1
libs/ardour/ardour/canvas_vars.h
View File

@ -37,6 +37,7 @@ CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch") CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor") CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label") CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar") CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar") CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar")
CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar") CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar")