allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Sort various things to reduce merge hell. No functional changes.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@2992 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2008-02-02 17:46:56 +00:00
parent 80c3677c83
commit d747d82f65
4 changed files with 206 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
gtk2_ardour/SConscript
View File

@@ -30,46 +30,46 @@ if gtkardour['IS_OSX']:
gtkardour.Merge ([
libraries['ardour'],
libraries['ardour_cp'],
libraries['gtkmm2ext'],
libraries['midi++2'],
libraries['pbd'],
libraries['gtkmm2'],
libraries['asound']
libraries['atkmm'],
libraries['cairomm'],
libraries['fftw3'],
libraries['fftw3f'],
libraries['flac'],
libraries['gdkmm2'],
libraries['glib2'],
libraries['glibmm2'],
libraries['gtk2'],
libraries['gtkmm2'],
libraries['gtkmm2ext'],
libraries['jack'],
libraries['libgnomecanvas2'],
libraries['libgnomecanvasmm'],
libraries['sysmidi'],
libraries['sndfile-ardour'],
libraries['flac'],
libraries['lrdf'],
libraries['glibmm2'],
libraries['midi++2'],
libraries['pangomm'],
libraries['atkmm'],
libraries['gdkmm2'],
libraries['sigc2'],
libraries['gtk2'],
libraries['xml'],
libraries['xslt'],
libraries['pbd'],
libraries['samplerate'],
libraries['sigc2'],
libraries['sndfile-ardour'],
libraries['sysmidi'],
libraries['vamp'],
libraries['vamphost'],
libraries['fftw3f'],
libraries['fftw3'],
libraries['jack'],
libraries['cairomm'],
libraries['asound']
libraries['xml'],
libraries['xslt'],
])
gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
gtkmmtests.Merge ([
libraries['gtkmm2'],
libraries['glib2'],
libraries['glibmm2'],
libraries['pangomm'],
libraries['atkmm'],
libraries['gdkmm2'],
libraries['sigc2'],
libraries['glib2'],
libraries['glibmm2'],
libraries['gtk2']
libraries['gtkmm2'],
libraries['pangomm'],
libraries['sigc2'],
])
if gtkardour['DMALLOC']:

167
gtk2_ardour/ardour3_ui_default.conf
View File

@@ -1,111 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<Ardour>
<UI>
<Option name="ui-rc-file" value="ardour3_ui_dark.rc"/>
</UI>
<Canvas>
<Option name="waveform outline" value="0f0f0fc8"/>
<Option name="waveform fill" value="3d4753dc"/>
<Option name="selected waveform outline" value="0f0f0fcc"/>
<Option name="selected waveform fill" value="51518ac8"/>
<Option name="clipped waveform" value="ff0000e5"/>
<Option name="region base" value="99a7b5a0"/>
<Option name="selected region base" value="51518aa0"/>
<Option name="midi frame base" value="698f9d6d"/>
<Option name="audio track base" value="c6d3d868"/>
<Option name="active crossfade" value="e8ed3d77"/>
<Option name="audio bus base" value="dbd1ea68"/>
<Option name="midi track base" value="c67e7e5f"/>
<Option name="midi bus base" value="ffceea40"/>
<Option name="time stretch fill" value="e2b5b596"/>
<Option name="time stretch outline" value="63636396"/>
<Option name="audio track base" value="c6d3d868"/>
<Option name="automation line" value="44bc59ff"/>
<Option name="processor automation line" value="7aa3f9ff"/>
<Option name="control point fill" value="ffffff66"/>
<Option name="control point outline" value="ffffffaa"/>
<Option name="entered control point outline" value="ff0000ee"/>
<Option name="entered control point selected" value="ff3535ff"/>
<Option name="entered control point" value="ffffffaa"/>
<Option name="control point selected" value="00ff00ff"/>
<Option name="control point" value="ff0000ff"/>
<Option name="automation track fill" value="a0a0ce68"/>
<Option name="automation track outline" value="282828ff"/>
<Option name="cd marker bar" value="9898a3ff"/>
<Option name="clipped waveform" value="ff0000e5"/>
<Option name="control point fill" value="ffffff66"/>
<Option name="control point outline" value="ffffffaa"/>
<Option name="control point selected" value="00ff00ff"/>
<Option name="control point" value="ff0000ff"/>
<Option name="crossfade editor base" value="282d49ff"/>
<Option name="crossfade editor line" value="000000ff"/>
<Option name="selected crossfade editor line" value="00dbdbff"/>
<Option name="crossfade editor line shading" value="00a0d154"/>
<Option name="crossfade editor line" value="000000ff"/>
<Option name="crossfade editor point fill" value="00ff00ff"/>
<Option name="crossfade editor point outline" value="0000ffff"/>
<Option name="crossfade editor wave" value="ffffff28"/>
<Option name="selected crossfade editor wave" value="f9ea14a0"/>
<Option name="crossfade line" value="000000ff"/>
<Option name="active crossfade" value="e8ed3d77"/>
<Option name="inactive crossfade" value="e8ed3d77"/>
<Option name="location marker" value="c4f411ff"/>
<Option name="location range" value="497a59ff"/>
<Option name="location cd marker" value="1ee8c4ff"/>
<Option name="location loop" value="35964fff"/>
<Option name="location punch" value="7c3a3aff"/>
<Option name="verbose canvas cursor" value="f4f214bc"/>
<Option name="marker label" value="000000ff"/>
<Option name="marker bar separator" value="aaaaaa77"/>
<Option name="tempo bar" value="72727fff"/>
<Option name="meter bar" value="666672ff"/>
<Option name="marker bar" value="a1a1adff"/>
<Option name="cd marker bar" value="9898a3ff"/>
<Option name="range marker bar" value="7f7f8cff"/>
<Option name="transport marker bar" value="8c8c96ff"/>
<Option name="range drag bar rect" value="969696c6"/>
<Option name="range drag rect" value="82c696c6"/>
<Option name="transport drag rect" value="969696c6"/>
<Option name="marker drag line" value="004f00f9"/>
<Option name="transport loop rect" value="1e7728f9"/>
<Option name="transport punch rect" value="6d2828e5"/>
<Option name="punch line" value="a80000ff"/>
<Option name="zoom rect" value="c6d1b26d"/>
<Option name="rubber band rect" value="c6c6c659"/>
<Option name="entered gain line" value="dd6363ff"/>
<Option name="edit point" value="0000ffff"/>
<Option name="entered automation line" value="dd6363ff"/>
<Option name="entered control point outline" value="ff0000ee"/>
<Option name="entered control point selected" value="ff3535ff"/>
<Option name="entered control point" value="ffffffaa"/>
<Option name="entered gain line" value="dd6363ff"/>
<Option name="entered marker" value="dd6363ff"/>
<Option name="meter marker" value="f2425bff"/>
<Option name="tempo marker" value="f2425bff"/>
<Option name="measure line beat" value="b5b5b576"/>
<Option name="measure line bar" value="d9d9d99c"/>
<Option name="frame handle" value="7c00ff96"/>
<Option name="gain line inactive" value="9fbca4c5"/>
<Option name="gain line" value="00bc20ff"/>
<Option name="ghost track base" value="44007c7f"/>
<Option name="ghost track wave" value="02fd004c"/>
<Option name="ghost track wave clip" value="ff000000"/>
<Option name="ghost track wave" value="02fd004c"/>
<Option name="ghost track zero line" value="e500e566"/>
<Option name="image track" value="ddddd8ff"/>
<Option name="inactive crossfade" value="e8ed3d77"/>
<Option name="location cd marker" value="1ee8c4ff"/>
<Option name="location loop" value="35964fff"/>
<Option name="location marker" value="c4f411ff"/>
<Option name="location punch" value="7c3a3aff"/>
<Option name="location range" value="497a59ff"/>
<Option name="marker bar separator" value="aaaaaa77"/>
<Option name="marker bar" value="a1a1adff"/>
<Option name="marker drag line" value="004f00f9"/>
<Option name="marker label" value="000000ff"/>
<Option name="marker track" value="ddddd8ff"/>
<Option name="zero line" value="b5b5b5ff"/>
<Option name="gain line" value="00bc20ff"/>
<Option name="gain line inactive" value="9fbca4c5"/>
<Option name="recording rect" value="e5c6c6ff"/>
<Option name="selection rect" value="e8f4d377"/>
<Option name="selection" value="636363b2"/>
<Option name="vestigial frame" value="0000000f"/>
<Option name="time axis frame" value="0000000f"/>
<Option name="measure line bar" value="d9d9d99c"/>
<Option name="measure line beat" value="b5b5b576"/>
<Option name="meter bar" value="666672ff"/>
<Option name="meter fill clip" value="ff0000ff"/>
<Option name="meter fill max" value="ee3333ff"/>
<Option name="meter fill mid" value="eeee33ff"/>
<Option name="meter fill min" value="33dd33ff"/>
<Option name="meter marker" value="f2425bff"/>
<Option name="midi bus base" value="ffceea40"/>
<Option name="midi frame base" value="698f9d6d"/>
<Option name="midi note fill max" value="ee33338a"/>
<Option name="midi note fill mid" value="eeee338a"/>
<Option name="midi note fill min" value="33ee338a"/>
<Option name="midi note outline max" value="ff2222b0"/>
<Option name="midi note outline mid" value="ffff22b0"/>
<Option name="midi note outline min" value="22ff22b0"/>
<Option name="midi note selected outline" value="5566ffee"/>
<Option name="midi select rect fill" value="8888ff88"/>
<Option name="midi select rect outline" value="5555ffff"/>
<Option name="midi track base" value="c67e7e5f"/>
<Option name="name highlight fill" value="0000ffff"/>
<Option name="name highlight outline" value="7c00ff96"/>
<Option name="frame handle" value="7c00ff96"/>
<Option name="piano roll black outline" value="b5b5b576"/>
<Option name="piano roll black" value="88393b6b"/>
<Option name="piano roll white" value="aa585865"/>
<Option name="play head" value="ff0000ff"/>
<Option name="processor automation line" value="7aa3f9ff"/>
<Option name="punch line" value="a80000ff"/>
<Option name="range drag bar rect" value="969696c6"/>
<Option name="range drag rect" value="82c696c6"/>
<Option name="range marker bar" value="7f7f8cff"/>
<Option name="recording rect" value="e5c6c6ff"/>
<Option name="region base" value="99a7b5a0"/>
<Option name="rubber band rect" value="c6c6c659"/>
<Option name="selected crossfade editor line" value="00dbdbff"/>
<Option name="selected crossfade editor wave" value="f9ea14a0"/>
<Option name="selected region base" value="51518aa0"/>
<Option name="selected waveform fill" value="51518ac8"/>
<Option name="selected waveform outline" value="0f0f0fcc"/>
<Option name="selection rect" value="e8f4d377"/>
<Option name="selection" value="636363b2"/>
<Option name="tempo bar" value="72727fff"/>
<Option name="tempo marker" value="f2425bff"/>
<Option name="time axis frame" value="0000000f"/>
<Option name="time stretch fill" value="e2b5b596"/>
<Option name="time stretch outline" value="63636396"/>
<Option name="transport drag rect" value="969696c6"/>
<Option name="transport loop rect" value="1e7728f9"/>
<Option name="transport marker bar" value="8c8c96ff"/>
<Option name="transport punch rect" value="6d2828e5"/>
<Option name="trim handle locked" value="ea0f0f28"/>
<Option name="trim handle" value="1900ff44"/>
<Option name="edit point" value="0000ffff"/>
<Option name="play head" value="ff0000ff"/>
<Option name="meter fill min" value="33dd33ff"/>
<Option name="meter fill mid" value="eeee33ff"/>
<Option name="meter fill max" value="ee3333ff"/>
<Option name="meter fill clip" value="ff0000ff"/>
<Option name="midi select rect outline" value="5555ffff"/>
<Option name="midi select rect fill" value="8888ff88"/>
<Option name="midi note outline min" value="22ff22b0"/>
<Option name="midi note outline mid" value="ffff22b0"/>
<Option name="midi note outline max" value="ff2222b0"/>
<Option name="midi note fill min" value="33ee338a"/>
<Option name="midi note fill mid" value="eeee338a"/>
<Option name="midi note fill max" value="ee33338a"/>
<Option name="midi note selected outline" value="5566ffee"/>
<Option name="piano roll white" value="aa585865"/>
<Option name="piano roll black" value="88393b6b"/>
<Option name="piano roll black outline" value="b5b5b576"/>
<Option name="verbose canvas cursor" value="f4f214bc"/>
<Option name="vestigial frame" value="0000000f"/>
<Option name="waveform fill" value="3d4753dc"/>
<Option name="waveform outline" value="0f0f0fc8"/>
<Option name="zero line" value="b5b5b5ff"/>
<Option name="zoom rect" value="c6d1b26d"/>
</Canvas>
</Ardour>

164
gtk2_ardour/canvas_vars.h
View File

@@ -1,103 +1,103 @@
CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time stretch fill")
CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time stretch outline")
CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line")
CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline")
CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave")
CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line")
CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
CANVAS_VARIABLE(canvasvar_Selection, "selection")
CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min")
CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")
CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "midi note fill max")
CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
CANVAS_VARIABLE(canvasvar_PianoRollBlack, "piano roll black")
CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
CANVAS_VARIABLE(canvasvar_PianoRollBlackOutline, "piano roll black outline")
CANVAS_VARIABLE(canvasvar_PianoRollBlack, "piano roll black")
CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
CANVAS_VARIABLE(canvasvar_Selection, "selection")
CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time stretch fill")
CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time stretch outline")
CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")

36
libs/ardour/SConscript
View File

@@ -28,21 +28,20 @@ ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
ardour_files=Split("""
amp.cc
audio_buffer.cc
auto_bundle.cc
user_bundle.cc
analyser.cc
audioanalyser.cc
audio_buffer.cc
audio_diskstream.cc
audioengine.cc
audiofilesource.cc
audio_library.cc
audio_playlist.cc
audio_port.cc
audio_track.cc
audioengine.cc
audiofilesource.cc
audioregion.cc
audiosource.cc
audio_track.cc
auditioner.cc
auto_bundle.cc
automatable.cc
automation.cc
automation_control.cc
@@ -72,9 +71,9 @@ globals.cc
import.cc
io.cc
io_processor.cc
jack_port.cc
jack_audio_port.cc
jack_midi_port.cc
jack_port.cc
jack_slave.cc
ladspa_plugin.cc
location.cc
@@ -112,8 +111,8 @@ reverse.cc
route.cc
route_group.cc
send.cc
session.cc
session_butler.cc
session.cc
session_click.cc
session_command.cc
session_directory.cc
@@ -137,6 +136,7 @@ template_utils.cc
tempo.cc
track.cc
transient_detector.cc
user_bundle.cc
utils.cc
version.cc
""")
@@ -299,20 +299,20 @@ ardour = conf.Finish ()
ardour.Merge ([
libraries['core'],
libraries['xml'],
libraries['sndfile-ardour'],
libraries['raptor'],
libraries['lrdf'],
libraries['samplerate'],
libraries['sigc2'],
libraries['pbd'],
libraries['midi++2'],
libraries['fftw3'],
libraries['fftw3f'],
libraries['glib2'],
libraries['glibmm2'],
libraries['lrdf'],
libraries['midi++2'],
libraries['pbd'],
libraries['raptor'],
libraries['samplerate'],
libraries['sigc2'],
libraries['sndfile-ardour'],
libraries['vamp'],
libraries['vamphost'],
libraries['fftw3f'],
libraries['fftw3'],
libraries['xml'],
])
if ardour['RUBBERBAND']: