diff options
| author | David Robillard <d@drobilla.net> | 2007-01-15 20:49:10 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-15 20:49:10 +0000 |
| commit | cd37c36326a165ddf6eb83c176213b0732a6db0d (patch) | |
| tree | 77ceddff2a62b1da71d2de3179be3ff0e519b765 | |
| parent | 7701c52adb28ce53ebec2a51e9b3ee0fee4f5ebd (diff) | |
Moved editor scrollbar to right side.
Fixed crash on creating MIDI tracks (MidiDiskstream::midi_playlist null deref).
git-svn-id: svn://localhost/ardour2/branches/midi@1330 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour.bindings | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings index 8d280b536d..03ff5ae331 100644 --- a/gtk2_ardour/ardour.bindings +++ b/gtk2_ardour/ardour.bindings @@ -121,7 +121,6 @@ ; (gtk_accel_path "<Actions>/Editor/EditSelectRegionOptions" "") (gtk_accel_path "<Actions>/Editor/crop" "c") ; (gtk_accel_path "<Actions>/redirectmenu/newsend" "") -; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurfaceSubMenu" "") ; (gtk_accel_path "<Actions>/Editor/MeterFalloff" "") ; (gtk_accel_path "<Actions>/RegionList/rlRemove" "") (gtk_accel_path "<Actions>/Transport/GotoStart" "Home") @@ -300,7 +299,6 @@ ; (gtk_accel_path "<Actions>/Snap/snap-to-region-sync" "") (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe") ; (gtk_accel_path "<Actions>/redirectmenu/clear" "") -; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurfaceFeedback" "") ; (gtk_accel_path "<Actions>/Editor/PullupPlus4Minus1" "") ; (gtk_accel_path "<Actions>/JACK/JACKLatency512" "") (gtk_accel_path "<Actions>/Editor/edit-cursor-to-next-region-end" "<Control>bracketright") diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c7c72dff2c..a80de0a8f4 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -437,7 +437,7 @@ Editor::Editor (AudioEngine& eng) edit_packer.set_border_width (0); edit_packer.set_name ("EditorWindow"); - edit_packer.attach (edit_vscrollbar, 0, 1, 1, 3, FILL, FILL|EXPAND, 0, 0); + edit_packer.attach (edit_vscrollbar, 3, 4, 1, 2, FILL, FILL|EXPAND, 0, 0); edit_packer.attach (time_button_event_box, 1, 2, 0, 1, FILL, FILL, 0, 0); edit_packer.attach (time_canvas_event_box, 2, 3, 0, 1, FILL|EXPAND, FILL, 0, 0); diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index f3de214791..b11e3f3062 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -260,7 +260,8 @@ MidiDiskstream::use_new_playlist () newname = Playlist::bump_name (_name, _session); } - if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (_session, newname, hidden()))) != 0) { + if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create ( + DataType::MIDI, _session, newname, hidden()))) != 0) { playlist->set_orig_diskstream_id (id()); return use_playlist (playlist); |