smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 15:16:25 +01:00
Code Issues Projects Releases Wiki Activity

merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-24 19:01:24 +00:00
parent ee2017d9ee
commit a2bb5c1feb
272 changed files with 4246 additions and 3800 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/about.cc
View file

@ -28,7 +28,6 @@
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "ardour/svn_revision.h" #include "ardour/svn_revision.h"
#include "ardour/ardour.h"
#include "ardour/version.h" #include "ardour/version.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"

1
gtk2_ardour/actions.cc
View file

@ -31,7 +31,6 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"

27
gtk2_ardour/ardour_ui.cc
View file

@ -60,26 +60,18 @@
#include "midi++/manager.h" #include "midi++/manager.h"
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/callback.h" #include "ardour/audioengine.h"
#include "ardour/audiofilesource.h"
#include "ardour/diskstream.h"
#include "ardour/filename_extensions.h"
#include "ardour/port.h"
#include "ardour/process_thread.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/plugin_manager.h" #include "ardour/recent_sessions.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
#include "ardour/session_route.h" #include "ardour/session_route.h"
#include "ardour/session_state_utils.h" #include "ardour/session_state_utils.h"
#include "ardour/session_utils.h" #include "ardour/session_utils.h"
#include "ardour/port.h"
#include "ardour/audioengine.h"
#include "ardour/playlist.h"
#include "ardour/utils.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audiofilesource.h"
#include "ardour/recent_sessions.h"
#include "ardour/port.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/filesystem_paths.h"
#include "ardour/filename_extensions.h"
#include "ardour/process_thread.h"
typedef uint64_t microseconds_t; typedef uint64_t microseconds_t;
@ -121,6 +113,7 @@ using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace Gtk; using namespace Gtk;
using namespace std;
ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
UIConfiguration *ARDOUR_UI::ui_config = 0; UIConfiguration *ARDOUR_UI::ui_config = 0;
@ -130,7 +123,7 @@ sigc::signal<void> ARDOUR_UI::RapidScreenUpdate;
sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate; sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate;
sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock; sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
bool could_be_a_valid_path (const string& path); bool could_be_a_valid_path (const std::string& path);
ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
@ -335,7 +328,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */ /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
bool bool
ARDOUR_UI::run_startup (bool should_be_new, string load_template) ARDOUR_UI::run_startup (bool should_be_new, std::string load_template)
{ {
delete _startup; delete _startup;
_startup = new ArdourStartup (); _startup = new ArdourStartup ();

6
gtk2_ardour/ardour_ui2.cc
View file

@ -37,11 +37,9 @@
#include <gtkmm2ext/click_box.h> #include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/tearoff.h> #include <gtkmm2ext/tearoff.h>
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/ardour.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/route.h" #include "ardour/session.h"
#include "ardour/types.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "keyboard.h" #include "keyboard.h"

1
gtk2_ardour/ardour_ui_ed.cc
View file

@ -61,7 +61,6 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/control_protocol_manager.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"

4
gtk2_ardour/ardour_ui_options.cc
View file

@ -26,10 +26,8 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour/configuration.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"
#include "ardour/session.h"
#ifdef HAVE_LIBLO #ifdef HAVE_LIBLO
#include "ardour/osc.h" #include "ardour/osc.h"

5
gtk2_ardour/audio_clock.cc
View file

@ -24,17 +24,16 @@
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include <gtkmm/style.h> #include <gtkmm/style.h>
#include <sigc++/bind.h>
#include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/cairocell.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/rgb_macros.h" #include "gtkmm2ext/rgb_macros.h"
#include "ardour/ardour.h" #include "ardour/types.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/tempo.h" #include "ardour/tempo.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/slave.h"
#include <sigc++/bind.h>
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_clock.h" #include "audio_clock.h"

10
gtk2_ardour/audio_region_editor.cc
View file

@ -17,17 +17,17 @@
*/ */
#include <cmath>
#include <gtkmm2ext/utils.h>
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#include "ardour/session.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/playlist.h" #include "ardour/session_event.h"
#include "ardour/utils.h"
#include "ardour/dB.h" #include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <cmath>
#include "audio_region_editor.h" #include "audio_region_editor.h"
#include "audio_region_view.h" #include "audio_region_view.h"

2
gtk2_ardour/audio_region_view.h
View file

@ -35,7 +35,7 @@
namespace ARDOUR { namespace ARDOUR {
class AudioRegion; class AudioRegion;
class PeakData; struct PeakData;
}; };
class AudioTimeAxisView; class AudioTimeAxisView;

2
gtk2_ardour/audio_streamview.cc
View file

@ -26,11 +26,9 @@
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/source.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"

4
gtk2_ardour/audio_streamview.h
View file

@ -35,10 +35,10 @@ namespace Gdk {
} }
namespace ARDOUR { namespace ARDOUR {
class Route;
class PeakData;
class AudioRegion; class AudioRegion;
class Route;
class Source; class Source;
struct PeakData;
} }
class PublicEditor; class PublicEditor;

11
gtk2_ardour/audio_time_axis.cc
View file

@ -36,19 +36,10 @@
#include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour/amp.h"
#include "ardour/audioplaylist.h"
#include "ardour/event_type_map.h" #include "ardour/event_type_map.h"
#include "ardour/location.h"
#include "ardour/pannable.h" #include "ardour/pannable.h"
#include "ardour/panner.h" #include "ardour/panner.h"
#include "ardour/panner_shell.h" #include "ardour/panner_shell.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
#include "ardour/utils.h"
#include "ardour_button.h" #include "ardour_button.h"
#include "ardour_ui.h" #include "ardour_ui.h"
@ -67,8 +58,6 @@
#include "audio_streamview.h" #include "audio_streamview.h"
#include "utils.h" #include "utils.h"
#include "ardour/audio_track.h"
#include "i18n.h" #include "i18n.h"
using namespace std; using namespace std;

6
gtk2_ardour/automation_controller.cc
View file

@ -23,12 +23,8 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "ardour/automation_list.h"
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
#include "ardour/automatable.h" #include "ardour/automatable.h"
#include "ardour/panner.h" #include "ardour/automation_control.h"
#include "ardour/pan_controllable.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour_ui.h" #include "ardour_ui.h"

1
gtk2_ardour/automation_region_view.cc
View file

@ -26,7 +26,6 @@
#include "ardour/midi_automation_list_binder.h" #include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/source.h"
#include "automation_region_view.h" #include "automation_region_view.h"
#include "editing.h" #include "editing.h"

2
gtk2_ardour/automation_selection.h
View file

@ -26,6 +26,6 @@ namespace ARDOUR {
class AutomationList; class AutomationList;
} }
struct AutomationSelection : std::list<boost::shared_ptr<ARDOUR::AutomationList> > {}; class AutomationSelection : public std::list<boost::shared_ptr<ARDOUR::AutomationList> > {};
#endif /* __ardour_gtk_automation_selection_h__ */ #endif /* __ardour_gtk_automation_selection_h__ */

1
gtk2_ardour/automation_streamview.cc
View file

@ -26,7 +26,6 @@
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/midi_source.h" #include "ardour/midi_source.h"
#include "ardour/region_factory.h"
#include "automation_streamview.h" #include "automation_streamview.h"
#include "region_view.h" #include "region_view.h"

3
gtk2_ardour/axis_view.cc
View file

@ -32,9 +32,6 @@
#include <gtkmm2ext/selector.h> #include <gtkmm2ext/selector.h>
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include "ardour/session.h"
#include "ardour/utils.h"
#include "public_editor.h" #include "public_editor.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "gui_object.h" #include "gui_object.h"

2
gtk2_ardour/axis_view.h
View file

@ -63,7 +63,7 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
std::string gui_property (const std::string& property_name) const; std::string gui_property (const std::string& property_name) const;
template<typename T> void set_gui_property (const std::string& property_name, const T& value) { template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
gui_object_state().set<T> (state_id(), property_name, value); gui_object_state().set_property<T> (state_id(), property_name, value);
} }
bool marked_for_display () const; bool marked_for_display () const;

1
gtk2_ardour/bundle_manager.cc
View file

@ -27,7 +27,6 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/user_bundle.h" #include "ardour/user_bundle.h"
#include "ardour/audioengine.h"
#include "bundle_manager.h" #include "bundle_manager.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "i18n.h" #include "i18n.h"

16
gtk2_ardour/canvas-flag.h
View file

@ -6,8 +6,6 @@
#include <libgnomecanvasmm/widget.h> #include <libgnomecanvasmm/widget.h>
#include <libgnomecanvasmm/text.h> #include <libgnomecanvasmm/text.h>
#include "ardour/midi_model.h"
#include "simplerect.h" #include "simplerect.h"
#include "simpleline.h" #include "simpleline.h"
@ -20,19 +18,19 @@ class CanvasFlag : public Group
{ {
public: public:
CanvasFlag(MidiRegionView& region, CanvasFlag(MidiRegionView& region,
Group& parent, Group& parent,
double height, double height,
guint outline_color_rgba = 0xc0c0c0ff, guint outline_color_rgba = 0xc0c0c0ff,
guint fill_color_rgba = 0x07070707, guint fill_color_rgba = 0x07070707,
double x = 0.0, double x = 0.0,
double y = 0.0); double y = 0.0);
virtual ~CanvasFlag(); virtual ~CanvasFlag();
virtual bool on_event(GdkEvent* ev); virtual bool on_event(GdkEvent* ev);
virtual void set_text(const std::string& a_text); virtual void set_text(const std::string& a_text);
virtual void set_height (double); virtual void set_height (double);
protected: protected:
Text* _text; Text* _text;

4
gtk2_ardour/canvas-sysex.h
View file

@ -20,6 +20,8 @@
#ifndef CANVAS_SYSEX_H_ #ifndef CANVAS_SYSEX_H_
#define CANVAS_SYSEX_H_ #define CANVAS_SYSEX_H_
#include <string>
#include "canvas-flag.h" #include "canvas-flag.h"
class MidiRegionView; class MidiRegionView;
@ -33,7 +35,7 @@ public:
CanvasSysEx( CanvasSysEx(
MidiRegionView& region, MidiRegionView& region,
Group& parent, Group& parent,
string& text, std::string& text,
double height, double height,
double x, double x,
double y); double y);

6
gtk2_ardour/edit_note_dialog.cc
View file

@ -19,11 +19,11 @@
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "edit_note_dialog.h"
#include "canvas-note-event.h" #include "canvas-note-event.h"
#include "edit_note_dialog.h"
#include "midi_region_view.h" #include "midi_region_view.h"
#include "i18n.h" #include "i18n.h"
using namespace Gtk; using namespace Gtk;

10
gtk2_ardour/editor.cc
View file

@ -60,20 +60,14 @@
#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioplaylist.h" #include "ardour/audioengine.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/location.h" #include "ardour/location.h"
#include "ardour/midi_region.h"
#include "ardour/plugin_manager.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "ardour/session_directory.h" #include "ardour/session_playlists.h"
#include "ardour/session_route.h"
#include "ardour/session_state_utils.h"
#include "ardour/tempo.h" #include "ardour/tempo.h"
#include "ardour/utils.h" #include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "ardour/audioengine.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"

3
gtk2_ardour/editor_actions.cc
View file

@ -20,17 +20,16 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gtk/gtkiconfactory.h> #include <gtk/gtkiconfactory.h>
#include "pbd/filesystem.h" #include "pbd/filesystem.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/search_path.h" #include "pbd/search_path.h"
#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/tearoff.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/types.h"
#include "actions.h" #include "actions.h"
#include "ardour_ui.h" #include "ardour_ui.h"

20
gtk2_ardour/editor_audio_import.cc
View file

@ -33,22 +33,16 @@
#include <gtkmm2ext/choice.h> #include <gtkmm2ext/choice.h>
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audio_diskstream.h"
#include "ardour/midi_track.h"
#include "ardour/midi_region.h"
#include "ardour/utils.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/region_factory.h" #include "ardour/audioregion.h"
#include "ardour/source_factory.h" #include "ardour/midi_region.h"
#include "ardour/session.h" #include "ardour/midi_track.h"
#include "ardour/smf_source.h"
#include "ardour/operations.h" #include "ardour/operations.h"
#include "ardour/region_factory.h"
#include "ardour/smf_source.h"
#include "ardour/source_factory.h"
#include "ardour/utils.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "ardour_ui.h" #include "ardour_ui.h"

2
gtk2_ardour/editor_audiotrack.cc
View file

@ -17,8 +17,6 @@
*/ */
#include "ardour/location.h"
#include "ardour/audio_diskstream.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"
#include "ardour_ui.h" #include "ardour_ui.h"

4
gtk2_ardour/editor_canvas_events.cc
View file

@ -24,10 +24,8 @@
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/region_factory.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/region_factory.h"
#include "editor.h" #include "editor.h"
#include "keyboard.h" #include "keyboard.h"

13
gtk2_ardour/editor_cursors.h
View file

@ -21,12 +21,13 @@
class Editor; class Editor;
struct EditorCursor { class EditorCursor {
Editor& editor; public:
ArdourCanvas::Points points; Editor& editor;
ArdourCanvas::Line canvas_item; ArdourCanvas::Points points;
ArdourCanvas::Line canvas_item;
framepos_t current_frame; framepos_t current_frame;
double length; double length;
EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
~EditorCursor (); ~EditorCursor ();
@ -35,5 +36,5 @@ struct EditorCursor {
void set_length (double units); void set_length (double units);
void set_y_axis (double position); void set_y_axis (double position);
PBD::Signal1<void, framepos_t> PositionChanged; PBD::Signal1<void, framepos_t> PositionChanged;
}; };

3
gtk2_ardour/editor_drag.h
View file

@ -242,8 +242,9 @@ private:
class RegionDrag; class RegionDrag;
/** Container for details about a region being dragged */ /** Container for details about a region being dragged */
struct DraggingView class DraggingView
{ {
public:
DraggingView (RegionView *, RegionDrag *); DraggingView (RegionView *, RegionDrag *);
RegionView* view; ///< the view RegionView* view; ///< the view

67
gtk2_ardour/editor_export_audio.cc
View file

@ -29,10 +29,8 @@
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/audiofilesource.h"
#include "ardour/audioplaylist.h" #include "ardour/audioplaylist.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/chan_count.h" #include "ardour/chan_count.h"
@ -46,6 +44,7 @@
#include "audio_time_axis.h" #include "audio_time_axis.h"
#include "editor.h" #include "editor.h"
#include "export_dialog.h" #include "export_dialog.h"
#include "midi_export_dialog.h"
#include "midi_region_view.h" #include "midi_region_view.h"
#include "public_editor.h" #include "public_editor.h"
#include "selection.h" #include "selection.h"
@ -110,20 +109,68 @@ Editor::export_region ()
return; return;
} }
try { boost::shared_ptr<Region> r = selection->regions.front()->region();
boost::shared_ptr<Region> r = selection->regions.front()->region(); boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion>(r);
AudioRegion & region (dynamic_cast<AudioRegion &> (*r)); boost::shared_ptr<MidiRegion> midi_region = boost::dynamic_pointer_cast<MidiRegion>(r);
if (audio_region) {
RouteTimeAxisView & rtv (dynamic_cast<RouteTimeAxisView &> (selection->regions.front()->get_time_axis_view())); RouteTimeAxisView & rtv (dynamic_cast<RouteTimeAxisView &> (selection->regions.front()->get_time_axis_view()));
AudioTrack & track (dynamic_cast<AudioTrack &> (*rtv.route())); AudioTrack & track (dynamic_cast<AudioTrack &> (*rtv.route()));
ExportRegionDialog dialog (*this, region, track); ExportRegionDialog dialog (*this, *(audio_region.get()), track);
dialog.set_session (_session); dialog.set_session (_session);
dialog.run(); dialog.run ();
} catch (std::bad_cast & e) { } else if (midi_region) {
error << "Exporting Region failed!" << endmsg;
return; MidiExportDialog dialog (*this, midi_region);
dialog.set_session (_session);
int ret = dialog.run ();
switch (ret) {
case Gtk::RESPONSE_ACCEPT:
break;
default:
return;
}
dialog.hide ();
string path = dialog.get_path ();
if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
MessageDialog checker (_("File Exists!"),
true,
Gtk::MESSAGE_WARNING,
Gtk::BUTTONS_NONE);
checker.set_title (_("File Exists!"));
checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
checker.add_button (_("Overwrite Existing File"), RESPONSE_ACCEPT);
checker.set_default_response (RESPONSE_CANCEL);
checker.set_wmclass (X_("midi_export_file_exists"), PROGRAM_NAME);
checker.set_position (Gtk::WIN_POS_MOUSE);
ret = checker.run ();
switch (ret) {
case Gtk::RESPONSE_ACCEPT:
/* force unlink because the backend code will
go wrong if it tries to open an existing
file for writing.
*/
::unlink (path.c_str());
break;
default:
return;
}
}
(void) midi_region->clone (path);
} }
} }

6
gtk2_ardour/editor_keys.cc
View file

@ -21,17 +21,17 @@
#include <cmath> #include <cmath>
#include <string> #include <string>
#include <gtkmm/treeview.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/region.h"
#include <gtkmm/treeview.h>
#include "ardour_ui.h" #include "ardour_ui.h"
#include "editor.h" #include "editor.h"
#include "time_axis_view.h"
#include "region_view.h" #include "region_view.h"
#include "selection.h" #include "selection.h"
#include "time_axis_view.h"
#include "i18n.h" #include "i18n.h"

18
gtk2_ardour/editor_mouse.cc
View file

@ -62,20 +62,14 @@
#include "editor_cursors.h" #include "editor_cursors.h"
#include "verbose_cursor.h" #include "verbose_cursor.h"
#include "ardour/types.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/audio_track.h"
#include "ardour/playlist.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/midi_region.h"
#include "ardour/dB.h"
#include "ardour/utils.h"
#include "ardour/region_factory.h"
#include "ardour/source_factory.h"
#include "ardour/session.h"
#include "ardour/operations.h" #include "ardour/operations.h"
#include "ardour/playlist.h"
#include "ardour/profile.h"
#include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include <bitset> #include <bitset>

2
gtk2_ardour/editor_ops.cc
View file

@ -49,12 +49,10 @@
#include "ardour/quantize.h" #include "ardour/quantize.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/reverse.h" #include "ardour/reverse.h"
#include "ardour/route_group.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_playlists.h" #include "ardour/session_playlists.h"
#include "ardour/strip_silence.h" #include "ardour/strip_silence.h"
#include "ardour/transient_detector.h" #include "ardour/transient_detector.h"
#include "ardour/utils.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "debug.h" #include "debug.h"

6
gtk2_ardour/editor_regions.cc
View file

@ -28,10 +28,9 @@
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/silentfilesource.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/silentfilesource.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "gtkmm2ext/choice.h" #include "gtkmm2ext/choice.h"
@ -303,7 +302,6 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
TreeModel::iterator iter = _model->get_iter ("0"); TreeModel::iterator iter = _model->get_iter ("0");
TreeModel::Row parent; TreeModel::Row parent;
TreeModel::Row child;
if (!iter) { if (!iter) {
parent = *(_model->append()); parent = *(_model->append());
@ -550,7 +548,7 @@ EditorRegions::selection_changed ()
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
if (iter = _model->get_iter (*i)) { if ((iter = _model->get_iter (*i))) {
boost::shared_ptr<Region> region = (*iter)[_columns.region]; boost::shared_ptr<Region> region = (*iter)[_columns.region];
// they could have clicked on a row that is just a placeholder, like "Hidden" // they could have clicked on a row that is just a placeholder, like "Hidden"

9
gtk2_ardour/editor_selection.cc
View file

@ -22,12 +22,11 @@
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"
#include "ardour/session.h"
#include "ardour/playlist.h"
#include "ardour/route_group.h"
#include "ardour/profile.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/audioplaylist.h" #include "ardour/playlist.h"
#include "ardour/profile.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"

1
gtk2_ardour/editor_snapshots.cc
View file

@ -25,7 +25,6 @@
#include "editor_snapshots.h" #include "editor_snapshots.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "i18n.h" #include "i18n.h"
#include "editor.h"
#include "utils.h" #include "utils.h"
#include "prompter.h" #include "prompter.h"

8
gtk2_ardour/editor_timefx.cc
View file

@ -37,14 +37,12 @@
#include "region_selection.h" #include "region_selection.h"
#include "time_fx_dialog.h" #include "time_fx_dialog.h"
#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_track.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/stretch.h"
#include "ardour/midi_stretch.h" #include "ardour/midi_stretch.h"
#include "ardour/pitch.h" #include "ardour/pitch.h"
#include "ardour/region.h"
#include "ardour/session.h"
#include "ardour/stretch.h"
#ifdef USE_RUBBERBAND #ifdef USE_RUBBERBAND
#include "rubberband/RubberBandStretcher.h" #include "rubberband/RubberBandStretcher.h"

2
gtk2_ardour/engine_dialog.cc
View file

@ -43,8 +43,8 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#endif #endif
#include "ardour/profile.h"
#include "ardour/soundgrid.h" #include "ardour/soundgrid.h"
#include <jack/jack.h> #include <jack/jack.h>
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"

3
gtk2_ardour/export_channel_selector.cc
View file

@ -24,12 +24,9 @@
#include "pbd/convert.h" #include "pbd/convert.h"
#include "ardour/audio_port.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/export_channel_configuration.h" #include "ardour/export_channel_configuration.h"
#include "ardour/export_handler.h"
#include "ardour/io.h" #include "ardour/io.h"
#include "ardour/route.h" #include "ardour/route.h"
#include "ardour/session.h" #include "ardour/session.h"

1
gtk2_ardour/export_channel_selector.h
View file

@ -24,7 +24,6 @@
#include <list> #include <list>
#include "ardour/export_profile_manager.h" #include "ardour/export_profile_manager.h"
#include "ardour/export_channel.h"
#include <gtkmm.h> #include <gtkmm.h>
#include <sigc++/signal.h> #include <sigc++/signal.h>

4
gtk2_ardour/export_filename_selector.cc
View file

@ -22,10 +22,6 @@
#include "export_filename_selector.h" #include "export_filename_selector.h"
#include "ardour/export_handler.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "i18n.h" #include "i18n.h"
using namespace ARDOUR; using namespace ARDOUR;

10
gtk2_ardour/export_format_dialog.cc
View file

@ -393,7 +393,7 @@ ExportFormatDialog::init_format_table ()
boost::shared_ptr<HasSampleFormat> hsf; boost::shared_ptr<HasSampleFormat> hsf;
if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (*it)) { if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (*it))) {
hsf->SampleFormatSelectChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_selection, this, _1, _2), gui_context()); hsf->SampleFormatSelectChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_selection, this, _1, _2), gui_context());
hsf->SampleFormatCompatibleChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_compatibility, this, _1, _2), gui_context()); hsf->SampleFormatCompatibleChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_compatibility, this, _1, _2), gui_context());
@ -832,13 +832,13 @@ ExportFormatDialog::change_encoding_options (ExportFormatPtr ptr)
boost::shared_ptr<ARDOUR::ExportFormatFLAC> flac_ptr; boost::shared_ptr<ARDOUR::ExportFormatFLAC> flac_ptr;
boost::shared_ptr<ARDOUR::ExportFormatBWF> bwf_ptr; boost::shared_ptr<ARDOUR::ExportFormatBWF> bwf_ptr;
if (linear_ptr = boost::dynamic_pointer_cast<ExportFormatLinear> (ptr)) { if ((linear_ptr = boost::dynamic_pointer_cast<ExportFormatLinear> (ptr))) {
show_linear_enconding_options (linear_ptr); show_linear_enconding_options (linear_ptr);
} else if (ogg_ptr = boost::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr)) { } else if ((ogg_ptr = boost::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr))) {
show_ogg_enconding_options (ogg_ptr); show_ogg_enconding_options (ogg_ptr);
} else if (flac_ptr = boost::dynamic_pointer_cast<ExportFormatFLAC> (ptr)) { } else if ((flac_ptr = boost::dynamic_pointer_cast<ExportFormatFLAC> (ptr))) {
show_flac_enconding_options (flac_ptr); show_flac_enconding_options (flac_ptr);
} else if (bwf_ptr = boost::dynamic_pointer_cast<ExportFormatBWF> (ptr)) { } else if ((bwf_ptr = boost::dynamic_pointer_cast<ExportFormatBWF> (ptr))) {
show_bwf_enconding_options (bwf_ptr); show_bwf_enconding_options (bwf_ptr);
} else { } else {
std::cout << "Unrecognized format!" << std::endl; std::cout << "Unrecognized format!" << std::endl;

1
gtk2_ardour/export_format_selector.cc
View file

@ -24,7 +24,6 @@
#include "ardour/export_format_specification.h" #include "ardour/export_format_specification.h"
#include "ardour/export_profile_manager.h" #include "ardour/export_profile_manager.h"
#include "ardour/session.h"
#include "i18n.h" #include "i18n.h"

1
gtk2_ardour/export_timespan_selector.cc
View file

@ -22,7 +22,6 @@
#include "ardour_ui.h" #include "ardour_ui.h"
#include "ardour/tempo.h"
#include "ardour/location.h" #include "ardour/location.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/session.h" #include "ardour/session.h"

2
gtk2_ardour/export_timespan_selector.h
View file

@ -21,7 +21,6 @@
#ifndef __export_timespan_selector_h__ #ifndef __export_timespan_selector_h__
#define __export_timespan_selector_h__ #define __export_timespan_selector_h__
#include "public_editor.h"
#include "audio_clock.h" #include "audio_clock.h"
#include <list> #include <list>
@ -40,6 +39,7 @@ namespace ARDOUR {
} }
using ARDOUR::CDMarkerFormat; using ARDOUR::CDMarkerFormat;
using ARDOUR::framecnt_t;
/// Timespan Selector base /// Timespan Selector base
class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr

1
gtk2_ardour/fft_result.h
View file

@ -21,7 +21,6 @@
#ifndef __ardour_fft_result_h #ifndef __ardour_fft_result_h
#define __ardour_fft_result_h #define __ardour_fft_result_h
#include "ardour/types.h"
#include <fftw3.h> #include <fftw3.h>
#include <gdkmm/color.h> #include <gdkmm/color.h>

3
gtk2_ardour/gain_meter.cc
View file

@ -20,10 +20,7 @@
#include <limits.h> #include <limits.h>
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/route.h"
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_route.h" #include "ardour/session_route.h"
#include "ardour/dB.h" #include "ardour/dB.h"
#include "ardour/utils.h" #include "ardour/utils.h"

2
gtk2_ardour/group_tabs.cc
View file

@ -545,7 +545,7 @@ GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color)
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue()); snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue());
gui_state.set (group_gui_id (group), "color", buf); gui_state.set_property (group_gui_id (group), "color", buf);
/* the group color change notification */ /* the group color change notification */

2
gtk2_ardour/gui_object.h
View file

@ -43,7 +43,7 @@ public:
std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0); std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0);
template<typename T> void set (const std::string& id, const std::string& prop_name, const T& val) { template<typename T> void set_property (const std::string& id, const std::string& prop_name, const T& val) {
XMLNode* child = get_or_add_node (id); XMLNode* child = get_or_add_node (id);
std::stringstream s; std::stringstream s;
s << val; s << val;

23
gtk2_ardour/io_selector.cc
View file

@ -17,21 +17,18 @@
*/ */
#include <stdint.h>
#include <glibmm/objectbase.h> #include <glibmm/objectbase.h>
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include "ardour/port_insert.h"
#include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/track.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/mtdm.h"
#include "ardour/data_type.h"
#include "ardour/port.h"
#include "ardour/bundle.h" #include "ardour/bundle.h"
#include "ardour/data_type.h"
#include "ardour/io.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "io_selector.h" #include "io_selector.h"
#include "utils.h" #include "utils.h"
@ -207,13 +204,13 @@ IOSelector::list_is_global (int dim) const
return (dim == _other); return (dim == _other);
} }
string std::string
IOSelector::disassociation_verb () const IOSelector::disassociation_verb () const
{ {
return _("Disconnect"); return _("Disconnect");
} }
string std::string
IOSelector::channel_noun () const IOSelector::channel_noun () const
{ {
return _("port"); return _("port");
@ -256,7 +253,7 @@ void
IOSelectorWindow::on_show () IOSelectorWindow::on_show ()
{ {
Gtk::Window::on_show (); Gtk::Window::on_show ();
pair<uint32_t, uint32_t> const pm_max = _selector.max_size (); std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
} }
@ -265,7 +262,7 @@ IOSelectorWindow::io_name_changed (void*)
{ {
ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src) ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
string title; std::string title;
if (!_selector.find_inputs_for_io_outputs()) { if (!_selector.find_inputs_for_io_outputs()) {
title = string_compose(_("%1 input"), _selector.io()->name()); title = string_compose(_("%1 input"), _selector.io()->name());

2
gtk2_ardour/keyeditor.cc
View file

@ -23,8 +23,6 @@
#include <map> #include <map>
#include "ardour/profile.h"
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/accelkey.h> #include <gtkmm/accelkey.h>

5
gtk2_ardour/level_meter.cc
View file

@ -19,9 +19,6 @@
#include <limits.h> #include <limits.h>
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "ardour/dB.h"
#include "ardour/meter.h" #include "ardour/meter.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
@ -39,8 +36,6 @@
#include "keyboard.h" #include "keyboard.h"
#include "public_editor.h" #include "public_editor.h"
#include "ardour/session.h"
#include "i18n.h" #include "i18n.h"
using namespace ARDOUR; using namespace ARDOUR;

2
gtk2_ardour/location_ui.cc
View file

@ -22,8 +22,6 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour/utils.h"
#include "ardour/configuration.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"

12
gtk2_ardour/lv2_plugin_ui.cc
View file

@ -18,12 +18,10 @@
*/ */
#include "ardour/lv2_plugin.h" #include "ardour/lv2_plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/processor.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "pbd/error.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "gui_thread.h"
#include "lv2_plugin_ui.h" #include "lv2_plugin_ui.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
@ -31,6 +29,8 @@
#include <lilv/lilv.h> #include <lilv/lilv.h>
#include <suil/suil.h> #include <suil/suil.h>
#include "i18n.h"
using namespace ARDOUR; using namespace ARDOUR;
using namespace Gtk; using namespace Gtk;
using namespace PBD; using namespace PBD;
@ -272,6 +272,12 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
pack_start(*_ardour_buttons_box, false, false); pack_start(*_ardour_buttons_box, false, false);
GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst); GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
if (!c_widget) {
error << _("failed to get LV2 UI widget") << endmsg;
suil_instance_free((SuilInstance*)_inst);
_inst = NULL;
return;
}
_gui_widget = Gtk::manage(Glib::wrap(c_widget)); _gui_widget = Gtk::manage(Glib::wrap(c_widget));
_gui_widget->show_all(); _gui_widget->show_all();
pack_start(*_gui_widget, true, true); pack_start(*_gui_widget, true, true);

6
gtk2_ardour/main.cc
View file

@ -182,7 +182,8 @@ fixup_bundle_environment (int, char* [])
export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources"); export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources");
export_search_path (dir_path, "LADSPA_PATH", "/../Plugins"); export_search_path (dir_path, "LADSPA_PATH", "/../Plugins");
export_search_path (dir_path, "VAMP_PATH", "/../Frameworks"); export_search_path (dir_path, "VAMP_PATH", "/../lib");
export_search_path (dir_path, "SUIL_MODULE_DIR", "/../lib");
path = dir_path; path = dir_path;
path += "/../lib/clearlooks"; path += "/../lib/clearlooks";
@ -262,7 +263,7 @@ fixup_bundle_environment (int, char* [])
// JACK driver dir // JACK driver dir
path = dir_path; path = dir_path;
path += "/../Frameworks"; path += "/../lib";
setenv ("JACK_DRIVER_DIR", path.c_str(), 1); setenv ("JACK_DRIVER_DIR", path.c_str(), 1);
} }
@ -298,6 +299,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
export_search_path (dir_path, "LADSPA_PATH", "/../plugins"); export_search_path (dir_path, "LADSPA_PATH", "/../plugins");
export_search_path (dir_path, "VAMP_PATH", "/lib"); export_search_path (dir_path, "VAMP_PATH", "/lib");
export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
path = dir_path; path = dir_path;
path += "/lib/clearlooks"; path += "/lib/clearlooks";

2
gtk2_ardour/marker.cc
View file

@ -235,7 +235,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
unit_position = editor.frame_to_unit (frame); unit_position = editor.frame_to_unit (frame);
unit_position -= _shift; unit_position -= _shift;
group = new Group (parent, unit_position, 1.0); group = new Group (parent, unit_position, 0);
_name_background = new ArdourCanvas::SimpleRect (*group); _name_background = new ArdourCanvas::SimpleRect (*group);
_name_background->property_outline_pixels() = 1; _name_background->property_outline_pixels() = 1;

67
gtk2_ardour/midi_export_dialog.cc Normal file
View file

@ -0,0 +1,67 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm/stock.h>
#include "ardour/directory_names.h"
#include "ardour/midi_region.h"
#include "ardour/session.h"
#include "midi_export_dialog.h"
using namespace ARDOUR;
MidiExportDialog::MidiExportDialog (PublicEditor&, boost::shared_ptr<MidiRegion> region)
: ArdourDialog (string_compose (_("Export MIDI: %1"), region->name()))
, file_chooser (Gtk::FILE_CHOOSER_ACTION_SAVE)
{
set_border_width (12);
add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
get_vbox()->set_border_width (12);
get_vbox()->pack_start (file_chooser);
set_default_response (Gtk::RESPONSE_ACCEPT);
file_chooser.set_current_name (region->name() + ".mid");
file_chooser.show ();
file_chooser.signal_file_activated().connect (sigc::bind (sigc::mem_fun (*this, &MidiExportDialog::response), Gtk::RESPONSE_ACCEPT));
}
MidiExportDialog::~MidiExportDialog ()
{
}
void
MidiExportDialog::set_session (Session* s)
{
ArdourDialog::set_session (s);
file_chooser.set_current_folder (Glib::build_filename (Glib::path_get_dirname (s->path()), ARDOUR::export_dir_name));
}
std::string
MidiExportDialog::get_path () const
{
return file_chooser.get_filename ();
}

43
gtk2_ardour/midi_export_dialog.h Normal file
View file

@ -0,0 +1,43 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __gtk2_ardour_midi_export_dialog_h__
#define __gtk2_ardour_midi_export_dialog_h__
#include <boost/shared_ptr.hpp>
#include <gtkmm/filechooser.h>
#include "ardour_dialog.h"
#include "public_editor.h"
class MidiExportDialog : public ArdourDialog {
public:
MidiExportDialog (PublicEditor& editor, boost::shared_ptr<ARDOUR::MidiRegion>);
~MidiExportDialog ();
void set_session (ARDOUR::Session*);
std::string get_path() const;
private:
Gtk::FileChooserWidget file_chooser;
};
#endif /* __gtk2_ardour_midi_export_dialog_h__ */

7
gtk2_ardour/midi_list_editor.cc
View file

@ -282,7 +282,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
previous_selection.push_back (*i); previous_selection.push_back (*i);
if (iter = model->get_iter (*i)) { if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note]; note = (*iter)[columns._note];
@ -445,7 +445,6 @@ MidiListEditor::key_release (GdkEventKey* ev)
TreeModel::Path path; TreeModel::Path path;
TreeViewColumn* col; TreeViewColumn* col;
TreeModel::iterator iter; TreeModel::iterator iter;
TreeModel::Row row;
MidiModel::NoteDiffCommand* cmd; MidiModel::NoteDiffCommand* cmd;
boost::shared_ptr<MidiModel> m (region->midi_source(0)->model()); boost::shared_ptr<MidiModel> m (region->midi_source(0)->model());
boost::shared_ptr<NoteType> note; boost::shared_ptr<NoteType> note;
@ -702,7 +701,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows (); TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
if (iter = model->get_iter (*i)) { if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note]; note = (*iter)[columns._note];
@ -809,7 +808,7 @@ MidiListEditor::selection_changed ()
NotePlayer* player = new NotePlayer (track); NotePlayer* player = new NotePlayer (track);
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
if (iter = model->get_iter (*i)) { if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note]; note = (*iter)[columns._note];
player->add (note); player->add (note);
} }

2
gtk2_ardour/midi_region_view.cc
View file

@ -31,8 +31,6 @@
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include "ardour/playlist.h"
#include "ardour/tempo.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/midi_source.h" #include "ardour/midi_source.h"
#include "ardour/midi_model.h" #include "ardour/midi_model.h"

4
gtk2_ardour/midi_streamview.cc
View file

@ -24,14 +24,12 @@
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include "ardour/midi_diskstream.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/midi_source.h" #include "ardour/midi_source.h"
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/smf_source.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "canvas-simplerect.h" #include "canvas-simplerect.h"

8
gtk2_ardour/midi_streamview.h
View file

@ -34,12 +34,12 @@ namespace Gdk {
} }
namespace ARDOUR { namespace ARDOUR {
class Route;
class Crossfade; class Crossfade;
class PeakData;
class MidiRegion;
class Source;
class MidiModel; class MidiModel;
class MidiRegion;
class Route;
class Source;
struct PeakData;
} }
class PublicEditor; class PublicEditor;

16
gtk2_ardour/midi_time_axis.cc
View file

@ -38,22 +38,22 @@
#include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/bindable_button.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "ardour/file_source.h" #include "ardour/event_type_map.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/location.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_patch_manager.h" #include "ardour/midi_patch_manager.h"
#include "ardour/midi_playlist.h" #include "ardour/midi_playlist.h"
#include "ardour/midi_region.h" #include "ardour/midi_region.h"
#include "ardour/midi_source.h" #include "ardour/midi_source.h"
#include "ardour/midi_track.h"
#include "ardour/operations.h" #include "ardour/operations.h"
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "ardour/processor.h" #include "ardour/region.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_playlist.h" #include "ardour/session_object.h"
#include "ardour/tempo.h" #include "ardour/source.h"
#include "ardour/utils.h" #include "ardour/track.h"
#include "ardour/types.h"
#include "midi++/names.h" #include "midi++/names.h"

1
gtk2_ardour/missing_plugin_dialog.cc
View file

@ -17,7 +17,6 @@
*/ */
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include "ardour/session.h"
#include "missing_plugin_dialog.h" #include "missing_plugin_dialog.h"
#include "i18n.h" #include "i18n.h"

1
gtk2_ardour/mixer_group_tabs.cc
View file

@ -22,7 +22,6 @@
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "ardour/session.h"
#include "mixer_group_tabs.h" #include "mixer_group_tabs.h"
#include "mixer_strip.h" #include "mixer_strip.h"
#include "mixer_ui.h" #include "mixer_ui.h"

21
gtk2_ardour/mixer_strip.cc
View file

@ -34,24 +34,21 @@
#include <gtkmm2ext/slider_controller.h> #include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/bindable_button.h>
#include "ardour/ardour.h" #include "ardour/audio_track.h"
#include "ardour/amp.h"
#include "ardour/session.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/internal_send.h" #include "ardour/internal_send.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/pannable.h" #include "ardour/pannable.h"
#include "ardour/panner.h" #include "ardour/panner.h"
#include "ardour/panner_shell.h" #include "ardour/panner_shell.h"
#include "ardour/send.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/user_bundle.h"
#include "ardour/port.h" #include "ardour/port.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "ardour/user_bundle.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "ardour_window.h" #include "ardour_window.h"
@ -1171,7 +1168,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
} }
if (each_io_has_one_connection) { if (each_io_has_one_connection) {
if ((total_connection_count == ardour_connection_count)) { if (total_connection_count == ardour_connection_count) {
// all connections are to the same track in ardour // all connections are to the same track in ardour
// "ardour:Master/" -> "Master" // "ardour:Master/" -> "Master"
string::size_type slash = ardour_track_name.find("/"); string::size_type slash = ardour_track_name.find("/");

2
gtk2_ardour/mixer_ui.cc
View file

@ -36,11 +36,9 @@
#include <gtkmm2ext/tearoff.h> #include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/window_title.h> #include <gtkmm2ext/window_title.h>
#include "ardour/audio_track.h"
#include "ardour/plugin_manager.h" #include "ardour/plugin_manager.h"
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_route.h"
#include "keyboard.h" #include "keyboard.h"
#include "mixer_ui.h" #include "mixer_ui.h"

2
gtk2_ardour/monitor_section.cc
View file

@ -8,10 +8,8 @@
#include "gtkmm2ext/actions.h" #include "gtkmm2ext/actions.h"
#include "gtkmm2ext/motionfeedback.h" #include "gtkmm2ext/motionfeedback.h"
#include "ardour/dB.h"
#include "ardour/monitor_processor.h" #include "ardour/monitor_processor.h"
#include "ardour/route.h" #include "ardour/route.h"
#include "ardour/utils.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "gui_thread.h" #include "gui_thread.h"

3
gtk2_ardour/mono_panner.cc
View file

@ -32,9 +32,8 @@
#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "ardour/panner.h"
#include "ardour/panner.h"
#include "ardour/pannable.h" #include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "global_signals.h" #include "global_signals.h"

1
gtk2_ardour/nag.cc
View file

@ -7,7 +7,6 @@
#include "pbd/openuri.h" #include "pbd/openuri.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
#include "nag.h" #include "nag.h"

1
gtk2_ardour/note_player.cc
View file

@ -20,7 +20,6 @@
#include <glibmm/main.h> #include <glibmm/main.h>
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/session.h"
#include "note_player.h" #include "note_player.h"

14
gtk2_ardour/panner_ui.cc
View file

@ -18,13 +18,17 @@
#include <limits.h> #include <limits.h>
#include "ardour/io.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/barcontroller.h> #include <gtkmm2ext/barcontroller.h>
#include "midi++/manager.h" #include "midi++/manager.h"
#include "pbd/fastlog.h" #include "pbd/fastlog.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/session.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "panner_ui.h" #include "panner_ui.h"
#include "panner2d.h" #include "panner2d.h"
@ -33,12 +37,6 @@
#include "stereo_panner.h" #include "stereo_panner.h"
#include "mono_panner.h" #include "mono_panner.h"
#include "ardour/delivery.h"
#include "ardour/session.h"
#include "ardour/panner.h"
#include "ardour/pannable.h"
#include "ardour/panner_shell.h"
#include "ardour/route.h"
#include "i18n.h" #include "i18n.h"

6
gtk2_ardour/playlist_selector.cc
View file

@ -20,12 +20,10 @@
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include "ardour/session_playlist.h"
#include "ardour/audio_diskstream.h"
#include "ardour/playlist.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioplaylist.h" #include "ardour/audioplaylist.h"
#include "ardour/configuration.h" #include "ardour/playlist.h"
#include "ardour/session_playlist.h"
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>

9
gtk2_ardour/plugin_eq_gui.h
View file

@ -21,15 +21,20 @@
#ifndef __ardour_plugin_eq_gui_h #ifndef __ardour_plugin_eq_gui_h
#define __ardour_plugin_eq_gui_h #define __ardour_plugin_eq_gui_h
#include "pbd/signals.h"
#include "ardour/buffer_set.h" #include "ardour/buffer_set.h"
#include "ardour/plugin_insert.h"
#include "ardour/plugin.h"
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/drawingarea.h> #include <gtkmm/drawingarea.h>
#include <gtkmm/combobox.h> #include <gtkmm/combobox.h>
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
namespace ARDOUR {
class Plugin;
class PluginInsert;
}
namespace GTKArdour { namespace GTKArdour {
class FFT; class FFT;
} }

2
gtk2_ardour/plugin_selector.cc
View file

@ -37,8 +37,6 @@
#include "ardour/plugin_manager.h" #include "ardour/plugin_manager.h"
#include "ardour/plugin.h" #include "ardour/plugin.h"
#include "ardour/configuration.h"
#include "ardour/session.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "plugin_selector.h" #include "plugin_selector.h"

5813
gtk2_ardour/po/ru.po
View file

File diff suppressed because it is too large Load diff

2
gtk2_ardour/point_selection.h
View file

@ -24,7 +24,7 @@
class ControlPoint; class ControlPoint;
struct PointSelection : public std::list<ControlPoint *> class PointSelection : public std::list<ControlPoint *>
{ {
}; };

11
gtk2_ardour/port_group.cc
View file

@ -24,16 +24,13 @@
#include "midi++/manager.h" #include "midi++/manager.h"
#include "midi++/mmc.h" #include "midi++/mmc.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/bundle.h"
#include "ardour/user_bundle.h"
#include "ardour/io_processor.h"
#include "ardour/midi_track.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "ardour/auditioner.h" #include "ardour/auditioner.h"
#include "ardour/bundle.h"
#include "ardour/control_protocol_manager.h" #include "ardour/control_protocol_manager.h"
#include "ardour/io_processor.h"
#include "ardour/session.h"
#include "ardour/user_bundle.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"
#include "gui_thread.h" #include "gui_thread.h"

13
gtk2_ardour/port_insert_ui.cc
View file

@ -22,17 +22,10 @@
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include "ardour/audioengine.h"
#include "ardour/mtdm.h"
#include "ardour/port_insert.h" #include "ardour/port_insert.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/audioengine.h"
#include "ardour/track.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/mtdm.h"
#include "ardour/data_type.h"
#include "ardour/port.h"
#include "ardour/bundle.h"
#include "port_insert_ui.h" #include "port_insert_ui.h"
#include "utils.h" #include "utils.h"
@ -170,7 +163,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
{ {
set_name ("IOSelectorWindow"); set_name ("IOSelectorWindow");
string title = _("Port Insert "); std::string title = _("Port Insert ");
title += pi->name(); title += pi->name();
set_title (title); set_title (title);

1
gtk2_ardour/port_matrix_column_labels.cc
View file

@ -20,7 +20,6 @@
#include <iostream> #include <iostream>
#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h" #include "ardour/bundle.h"
#include "ardour/types.h"
#include "port_matrix_column_labels.h" #include "port_matrix_column_labels.h"
#include "port_matrix.h" #include "port_matrix.h"
#include "port_matrix_body.h" #include "port_matrix_body.h"

1
gtk2_ardour/port_matrix_grid.cc
View file

@ -20,7 +20,6 @@
#include <iostream> #include <iostream>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include "ardour/bundle.h" #include "ardour/bundle.h"
#include "ardour/types.h"
#include "port_matrix_grid.h" #include "port_matrix_grid.h"
#include "port_matrix.h" #include "port_matrix.h"
#include "port_matrix_body.h" #include "port_matrix_body.h"

3
gtk2_ardour/port_matrix_types.h
View file

@ -22,8 +22,9 @@
#include "ardour/bundle.h" #include "ardour/bundle.h"
struct PortMatrixNode class PortMatrixNode
{ {
public:
PortMatrixNode () {} PortMatrixNode () {}
PortMatrixNode (ARDOUR::BundleChannel r, ARDOUR::BundleChannel c) : row (r), column (c) {} PortMatrixNode (ARDOUR::BundleChannel r, ARDOUR::BundleChannel c) : row (r), column (c) {}

7
gtk2_ardour/processor_box.cc
View file

@ -40,13 +40,10 @@
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/ardour.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/internal_send.h"
#include "ardour/internal_return.h" #include "ardour/internal_return.h"
#include "ardour/ladspa_plugin.h" #include "ardour/internal_send.h"
#include "ardour/meter.h"
#include "ardour/plugin_insert.h" #include "ardour/plugin_insert.h"
#include "ardour/port_insert.h" #include "ardour/port_insert.h"
#include "ardour/profile.h" #include "ardour/profile.h"
@ -54,7 +51,7 @@
#include "ardour/route.h" #include "ardour/route.h"
#include "ardour/send.h" #include "ardour/send.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/dB.h" #include "ardour/types.h"
#include "actions.h" #include "actions.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"

1
gtk2_ardour/public_editor.cc
View file

@ -18,7 +18,6 @@
*/ */
#include "public_editor.h" #include "public_editor.h"
#include "editor.h"
PublicEditor* PublicEditor::_instance = 0; PublicEditor* PublicEditor::_instance = 0;

41
gtk2_ardour/public_editor.h
View file

@ -36,7 +36,6 @@
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include "evoral/types.hpp" #include "evoral/types.hpp"
#include "ardour/route_group.h"
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"
@ -62,31 +61,31 @@ namespace Gtkmm2ext {
class TearOff; class TearOff;
} }
class Editor;
class TimeAxisViewItem;
class TimeAxisView;
class PluginUIWindow;
class PluginSelector;
class PlaylistSelector;
class XMLNode;
class Selection;
class AutomationLine;
class ControlPoint;
class SelectionRect;
class RouteTimeAxisView;
class RegionView;
class AudioRegionView; class AudioRegionView;
class TempoMarker; class AutomationLine;
class MeterMarker;
class Marker;
class AutomationTimeAxisView; class AutomationTimeAxisView;
class MarkerTimeAxis; class ControlPoint;
class ImageFrameView;
class ImageFrameTimeAxis;
class MarkerView;
class DragManager; class DragManager;
class Editor;
class ImageFrameTimeAxis;
class ImageFrameView;
class Marker;
class MarkerTimeAxis;
class MarkerView;
class MeterMarker;
class MouseCursors; class MouseCursors;
class PlaylistSelector;
class PluginSelector;
class PluginUIWindow;
class RegionView;
class RouteTimeAxisView;
class Selection;
class TempoMarker;
class TimeAxisView;
class TimeAxisViewItem;
class VerboseCursor; class VerboseCursor;
class XMLNode;
struct SelectionRect;
using ARDOUR::framepos_t; using ARDOUR::framepos_t;
using ARDOUR::framecnt_t; using ARDOUR::framecnt_t;

12
gtk2_ardour/region_editor.cc
View file

@ -17,18 +17,16 @@
*/ */
#include <cmath>
#include <gtkmm/listviewtext.h>
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include "ardour/session.h"
#include "ardour/region.h" #include "ardour/region.h"
#include "ardour/playlist.h" #include "ardour/session.h"
#include "ardour/utils.h"
#include "ardour/dB.h"
#include "ardour/source.h" #include "ardour/source.h"
#include "gtkmm2ext/utils.h"
#include <gtkmm/listviewtext.h>
#include <cmath>
#include "ardour_ui.h" #include "ardour_ui.h"
#include "clock_group.h" #include "clock_group.h"

2
gtk2_ardour/region_view.cc
View file

@ -26,8 +26,6 @@
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour_ui.h" #include "ardour_ui.h"

3
gtk2_ardour/return_ui.cc
View file

@ -19,10 +19,9 @@
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include "ardour/amp.h"
#include "ardour/io.h" #include "ardour/io.h"
#include "ardour/return.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"
#include "ardour/return.h"
#include "utils.h" #include "utils.h"
#include "return_ui.h" #include "return_ui.h"

7
gtk2_ardour/rhythm_ferret.cc
View file

@ -4,13 +4,10 @@
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "pbd/convert.h" #include "pbd/convert.h"
#include "ardour/transient_detector.h"
#include "ardour/onset_detector.h"
#include "ardour/audiosource.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/playlist.h" #include "ardour/onset_detector.h"
#include "ardour/region_factory.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/transient_detector.h"
#include "rhythm_ferret.h" #include "rhythm_ferret.h"
#include "audio_region_view.h" #include "audio_region_view.h"

5
gtk2_ardour/route_params_ui.cc
View file

@ -24,9 +24,7 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h> #include <gtkmm2ext/window_title.h>
#include "ardour/ardour.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/audio_track.h"
#include "ardour/plugin.h" #include "ardour/plugin.h"
#include "ardour/plugin_insert.h" #include "ardour/plugin_insert.h"
#include "ardour/plugin_manager.h" #include "ardour/plugin_manager.h"
@ -34,9 +32,6 @@
#include "ardour/return.h" #include "ardour/return.h"
#include "ardour/route.h" #include "ardour/route.h"
#include "ardour/send.h" #include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "gui_thread.h" #include "gui_thread.h"

4
gtk2_ardour/route_processor_selection.cc
View file

@ -21,10 +21,6 @@
#include <sigc++/bind.h> #include <sigc++/bind.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/route.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "mixer_strip.h" #include "mixer_strip.h"
#include "route_processor_selection.h" #include "route_processor_selection.h"

56
gtk2_ardour/route_time_axis.cc
View file

@ -43,22 +43,12 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/audioplaylist.h"
#include "ardour/diskstream.h"
#include "ardour/event_type_map.h" #include "ardour/event_type_map.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/location.h"
#include "ardour/panner.h"
#include "ardour/playlist.h"
#include "ardour/playlist.h"
#include "ardour/processor.h" #include "ardour/processor.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/region_factory.h"
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_playlist.h" #include "ardour/session_playlists.h"
#include "ardour/debug.h"
#include "ardour/utils.h"
#include "evoral/Parameter.hpp" #include "evoral/Parameter.hpp"
#include "ardour_ui.h" #include "ardour_ui.h"
@ -665,30 +655,30 @@ RouteTimeAxisView::build_display_menu ()
build_playlist_menu (); build_playlist_menu ();
items.push_back (MenuElem (_("Playlist"), *playlist_action_menu)); items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1); items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
route_group_menu->detach ();
WeakRouteList r;
for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
if (rtv) {
r.push_back (rtv->route ());
}
}
if (r.empty ()) {
r.push_back (route ());
}
route_group_menu->build (r);
items.push_back (MenuElem (_("Route Group"), *route_group_menu->menu ()));
build_automation_action_menu (true);
items.push_back (MenuElem (_("Automation"), *automation_action_menu));
items.push_back (SeparatorElem());
} }
route_group_menu->detach ();
WeakRouteList r;
for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
if (rtv) {
r.push_back (rtv->route ());
}
}
if (r.empty ()) {
r.push_back (route ());
}
route_group_menu->build (r);
items.push_back (MenuElem (_("Group"), *route_group_menu->menu ()));
build_automation_action_menu (true);
items.push_back (MenuElem (_("Automation"), *automation_action_menu));
items.push_back (SeparatorElem());
int active = 0; int active = 0;
int inactive = 0; int inactive = 0;
TrackSelection const & s = _editor.get_selection().tracks; TrackSelection const & s = _editor.get_selection().tracks;

15
gtk2_ardour/route_ui.cc
View file

@ -46,16 +46,13 @@
#include "route_time_axis.h" #include "route_time_axis.h"
#include "group_tabs.h" #include "group_tabs.h"
#include "ardour/route.h"
#include "ardour/event_type_map.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/midi_track.h" #include "ardour/audioengine.h"
#include "ardour/template_utils.h"
#include "ardour/filename_extensions.h" #include "ardour/filename_extensions.h"
#include "ardour/directory_names.h" #include "ardour/midi_track.h"
#include "ardour/profile.h" #include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/template_utils.h"
#include "i18n.h" #include "i18n.h"
using namespace Gtk; using namespace Gtk;
@ -1347,7 +1344,7 @@ RouteUI::set_color (const Gdk::Color & c)
the time axis view and the mixer strip the time axis view and the mixer strip
*/ */
gui_object_state().set<string> (route_state_id(), X_("color"), buf); gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
_route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */ _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
} }

1
gtk2_ardour/send_ui.cc
View file

@ -19,7 +19,6 @@
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include "ardour/amp.h"
#include "ardour/io.h" #include "ardour/io.h"
#include "ardour/send.h" #include "ardour/send.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"

5
gtk2_ardour/session_import_dialog.h
View file

@ -29,12 +29,11 @@
#include <gtkmm.h> #include <gtkmm.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "ardour/element_importer.h"
#include "ardour/element_import_handler.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"
namespace ARDOUR { namespace ARDOUR {
class ElementImportHandler;
class ElementImporter;
class Session; class Session;
} }

3
gtk2_ardour/session_metadata_dialog.cc
View file

@ -24,10 +24,9 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/session_utils.h" #include "ardour/session_utils.h"
#include "ardour/configuration.h"
#include "i18n.h" #include "i18n.h"

4
gtk2_ardour/session_option_editor.cc
View file

@ -18,10 +18,6 @@
*/ */
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/auditioner.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "session_option_editor.h" #include "session_option_editor.h"

2
gtk2_ardour/sfdb_ui.cc
View file

@ -43,7 +43,6 @@
#include "evoral/SMF.hpp" #include "evoral/SMF.hpp"
#include "ardour/amp.h"
#include "ardour/audio_library.h" #include "ardour/audio_library.h"
#include "ardour/auditioner.h" #include "ardour/auditioner.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
@ -53,7 +52,6 @@
#include "ardour/source_factory.h" #include "ardour/source_factory.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
#include "ardour/profile.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "editing.h" #include "editing.h"

1
gtk2_ardour/streamview.cc
View file

@ -25,7 +25,6 @@
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "ardour/region.h" #include "ardour/region.h"
#include "ardour/source.h"
#include "ardour/track.h" #include "ardour/track.h"
#include "ardour/session.h" #include "ardour/session.h"

4
gtk2_ardour/streamview.h
View file

@ -34,12 +34,12 @@ namespace Gdk {
} }
namespace ARDOUR { namespace ARDOUR {
class Route;
class Crossfade; class Crossfade;
class PeakData;
class Region; class Region;
class Route;
class Source; class Source;
class Track; class Track;
struct PeakData;
} }
struct RecBoxInfo { struct RecBoxInfo {

Some files were not shown because too many files have changed in this diff Show more