ardour/livetrax
13
0
Fork 0
Code

The petty tidying up remnants of a noble, yet utterly failed, tempo lines experiment.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3798 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-23 17:53:52 +00:00
parent 1bee7c3f93
commit 81c571f2f0
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/SConscript
View File

@ -113,8 +113,8 @@ actions.cc
add_midi_cc_track_dialog.cc
add_route_dialog.cc
ardour_dialog.cc
ardour_ui2.cc
ardour_ui.cc
ardour_ui2.cc
ardour_ui_dependents.cc
ardour_ui_dialogs.cc
ardour_ui_ed.cc
@ -132,9 +132,9 @@ automation_streamview.cc
automation_time_axis.cc
axis_view.cc
bundle_manager.cc
canvas-program-change.cc
canvas-note-event.cc
canvas-note.cc
canvas-program-change.cc
canvas-simpleline.c
canvas-simplerect.c
canvas-waveview.c
@ -144,12 +144,12 @@ crossfade_view.cc
curvetest.cc
diamond.cc
editing.cc
editor.cc
editor_actions.cc
editor_audio_import.cc
editor_audiotrack.cc
editor_canvas.cc
editor_canvas_events.cc
editor.cc
editor_cursors.cc
editor_edit_groups.cc
editor_export_audio.cc
@ -171,11 +171,11 @@ editor_tempodisplay.cc
editor_timefx.cc
engine_dialog.cc
enums.cc
export_format_dialog.cc
export_main_dialog.cc
export_channel_selector.cc
export_filename_selector.cc
export_format_dialog.cc
export_format_selector.cc
export_main_dialog.cc
export_timespan_selector.cc
gain_meter.cc
generic_pluginui.cc
@ -191,19 +191,19 @@ lineset.cc
location_ui.cc
main.cc
marker.cc
midi_channel_selector.cc
midi_port_dialog.cc
midi_region_view.cc
midi_scroomer.cc
midi_streamview.cc
midi_time_axis.cc
midi_channel_selector.cc
mixer_strip.cc
mixer_ui.cc
new_session_dialog.cc
option_editor.cc
opts.cc
panner2d.cc
panner.cc
panner2d.cc
panner_ui.cc
piano_roll_header.cc
playlist_selector.cc

2
gtk2_ardour/editor.h
View File

@ -237,7 +237,7 @@ class Editor : public PublicEditor
}
gulong frame_to_pixel (nframes64_t frame) const {
return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
}
void flush_canvas ();

4
gtk2_ardour/editor_tempodisplay.cc
View File

@ -149,9 +149,9 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
session->bbt_time(rightmost, next_beat);
if (previous_beat.beats > 1) {
previous_beat.beats -= 1;
previous_beat.beats -= 1;
} else if (previous_beat.bars > 1) {
previous_beat.bars--;
previous_beat.bars--;
previous_beat.beats += 1;
}
previous_beat.ticks = 0;