ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Trim include tree. 

git-svn-id: svn://localhost/ardour2/branches/3.0@10244 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-10-19 21:53:09 +00:00
parent 32bf6003c4
commit 0bc8832e20
17 changed files with 121 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/automation_region_view.cc
View File

@ -17,21 +17,24 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <utility>
#include "pbd/memento_command.h"
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_region.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "automation_region_view.h"
#include "gui_thread.h"
#include "public_editor.h"
#include "midi_automation_line.h"
#include "editor_drag.h"
#include "editor.h"
#include "editing.h"
#include "editor.h"
#include "editor_drag.h"
#include "gui_thread.h"
#include "midi_automation_line.h"
#include "public_editor.h"
#include "i18n.h"
@ -116,8 +119,8 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
automation_view()->canvas_display()->w2i (x, y);
/* clamp y */
y = max (y, 0.0);
y = min (y, _height - NAME_HIGHLIGHT_SIZE);
y = std::max (y, 0.0);
y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y);
}

1
gtk2_ardour/edit_note_dialog.cc
View File

@ -20,6 +20,7 @@
#include <gtkmm/stock.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 "midi_region_view.h"

6
gtk2_ardour/editor_drag.cc
View File

@ -29,10 +29,12 @@
#include "gtkmm2ext/utils.h"
#include "ardour/session.h"
#include "ardour/audioregion.h"
#include "ardour/dB.h"
#include "ardour/region_factory.h"
#include "ardour/midi_region.h"
#include "ardour/operations.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "editor.h"
#include "i18n.h"

36
gtk2_ardour/editor_export_audio.cc
View File

@ -27,27 +27,29 @@
#include "gtkmm2ext/choice.h"
#include "export_dialog.h"
#include "pbd/pthread_utils.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h"
#include "ardour/audiofilesource.h"
#include "ardour/audiofilesource.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/chan_count.h"
#include "ardour/midi_region.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/source_factory.h"
#include "ardour/types.h"
#include "audio_region_view.h"
#include "audio_time_axis.h"
#include "editor.h"
#include "export_dialog.h"
#include "midi_region_view.h"
#include "public_editor.h"
#include "selection.h"
#include "time_axis_view.h"
#include "audio_time_axis.h"
#include "audio_region_view.h"
#include "midi_region_view.h"
#include "pbd/pthread_utils.h"
#include "ardour/types.h"
#include "ardour/audio_track.h"
#include "ardour/audiofilesource.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audioregion.h"
#include "ardour/audioplaylist.h"
#include "ardour/chan_count.h"
#include "ardour/session_directory.h"
#include "ardour/source_factory.h"
#include "ardour/audiofilesource.h"
#include "ardour/session.h"
#include "i18n.h"

27
gtk2_ardour/editor_ops.cc
View File

@ -38,25 +38,26 @@
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/popup.h>
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/session.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audio_diskstream.h"
#include "ardour/utils.h"
#include "ardour/location.h"
#include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/region_factory.h"
#include "ardour/playlist_factory.h"
#include "ardour/reverse.h"
#include "ardour/transient_detector.h"
#include "ardour/dB.h"
#include "ardour/quantize.h"
#include "ardour/strip_silence.h"
#include "ardour/route_group.h"
#include "ardour/location.h"
#include "ardour/midi_region.h"
#include "ardour/operations.h"
#include "ardour/playlist_factory.h"
#include "ardour/quantize.h"
#include "ardour/region_factory.h"
#include "ardour/reverse.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/strip_silence.h"
#include "ardour/transient_detector.h"
#include "ardour/utils.h"
#include "ardour_ui.h"
#include "debug.h"

7
gtk2_ardour/midi_list_editor.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009 Paul Davis
Copyright (C) 2009 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
@ -14,14 +14,17 @@
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 <cmath>
#include "evoral/midi_util.h"
#include "evoral/Note.hpp"
#include "ardour/beats_frames_converter.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/session.h"
#include "ardour/tempo.h"

7
gtk2_ardour/midi_list_editor.h
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009 Paul Davis
Copyright (C) 2009 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
@ -14,7 +14,6 @@
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 __ardour_gtk2_midi_list_editor_h_
@ -30,6 +29,10 @@
#include "ardour_dialog.h"
namespace Evoral {
template<typename Time> class Note;
};
namespace ARDOUR {
class MidiRegion;
class MidiModel;

6
gtk2_ardour/midi_region_view.cc
View File

@ -294,6 +294,12 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
}
const boost::shared_ptr<ARDOUR::MidiRegion>
MidiRegionView::midi_region() const
{
return boost::dynamic_pointer_cast<ARDOUR::MidiRegion>(_region);
}
void
MidiRegionView::connect_to_diskstream ()
{

4
gtk2_ardour/midi_region_view.h
View File

@ -28,7 +28,6 @@
#include "pbd/signals.h"
#include "ardour/midi_track.h"
#include "ardour/midi_region.h"
#include "ardour/midi_model.h"
#include "ardour/diskstream.h"
#include "ardour/types.h"
@ -85,8 +84,7 @@ public:
virtual void init (Gdk::Color const & basic_color, bool wfd);
inline const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const
{ return boost::dynamic_pointer_cast<ARDOUR::MidiRegion>(_region); }
const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const;
inline MidiTimeAxisView* midi_view() const
{ return dynamic_cast<MidiTimeAxisView*>(&trackview); }

13
gtk2_ardour/midi_time_axis.cc
View File

@ -39,20 +39,21 @@
#include "gtkmm2ext/utils.h"
#include "ardour/file_source.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/midi_source.h"
#include "ardour/processor.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/location.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/operations.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
#include "ardour/tempo.h"
#include "ardour/utils.h"
#include "ardour/operations.h"
#include "midi++/names.h"

26
libs/ardour/ardour/midi_region.h
View File

@ -23,14 +23,7 @@
#include <vector>
#include "pbd/fastlog.h"
#include "pbd/undo.h"
#include "ardour/ardour.h"
#include "ardour/gain.h"
#include "ardour/logcurve.h"
#include "ardour/midi_model.h"
#include "ardour/midi_source.h"
#include "ardour/region.h"
class XMLNode;
@ -46,12 +39,17 @@ namespace ARDOUR {
}
}
namespace Evoral {
template<typename Time> class EventSink;
}
namespace ARDOUR {
class Route;
class Playlist;
class Session;
class MidiFilter;
class MidiModel;
class MidiSource;
class MidiStateTracker;
template<typename T> class MidiRingBuffer;
@ -91,22 +89,16 @@ class MidiRegion : public Region
/* automation */
boost::shared_ptr<Evoral::Control>
control(const Evoral::Parameter& id, bool create=false) {
return model()->control(id, create);
}
boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false);
virtual boost::shared_ptr<const Evoral::Control>
control(const Evoral::Parameter& id) const {
return model()->control(id);
}
virtual boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const;
/* export */
int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
boost::shared_ptr<MidiModel> model() { return midi_source()->model(); }
boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
boost::shared_ptr<MidiModel> model();
boost::shared_ptr<const MidiModel> model() const;
void fix_negative_start ();
void transpose (int);

5
libs/ardour/midi_diskstream.cc
View File

@ -46,17 +46,18 @@
#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_model.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_port.h"
#include "ardour/midi_region.h"
#include "ardour/playlist_factory.h"
#include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/smf_source.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "ardour/route.h"
#include "midi++/types.h"

7
libs/ardour/midi_playlist.cc
View File

@ -28,13 +28,14 @@
#include "evoral/EventList.hpp"
#include "ardour/debug.h"
#include "ardour/types.h"
#include "ardour/configuration.h"
#include "ardour/debug.h"
#include "ardour/midi_model.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/session.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "i18n.h"

25
libs/ardour/midi_region.cc
View File

@ -33,6 +33,7 @@
#include "ardour/automation_control.h"
#include "ardour/dB.h"
#include "ardour/gain.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_source.h"
@ -297,6 +298,30 @@ MidiRegion::separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr<Reg
return -1;
}
boost::shared_ptr<Evoral::Control>
MidiRegion::control (const Evoral::Parameter& id, bool create)
{
return model()->control(id, create);
}
boost::shared_ptr<const Evoral::Control>
MidiRegion::control (const Evoral::Parameter& id) const
{
return model()->control(id);
}
boost::shared_ptr<MidiModel>
MidiRegion::model()
{
return midi_source()->model();
}
boost::shared_ptr<const MidiModel>
MidiRegion::model() const
{
return midi_source()->model();
}
int
MidiRegion::exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&)
{

6
libs/ardour/midi_stretch.cc
View File

@ -20,10 +20,12 @@
#include "pbd/error.h"
#include "ardour/types.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_stretch.h"
#include "ardour/session.h"
#include "ardour/midi_region.h"
#include "ardour/types.h"
#include "i18n.h"

1
libs/ardour/region_factory.cc
View File

@ -36,6 +36,7 @@
using namespace ARDOUR;
using namespace PBD;
using namespace std;
PBD::Signal1<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion;
Glib::StaticMutex RegionFactory::region_map_lock;

1
libs/ardour/session_state.cc
View File

@ -90,6 +90,7 @@
#include "ardour/io_processor.h"
#include "ardour/location.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_model.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"