Trim the include tree.
This commit is contained in:
parent
1693e57e0e
commit
2588b1cac9
@ -28,7 +28,6 @@
|
||||
#include "midi++/midnam_patch.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "midi_region_view.h"
|
||||
#include "canvas_patch_change.h"
|
||||
#include "editor.h"
|
||||
#include "editor_drag.h"
|
||||
|
@ -18,7 +18,6 @@
|
||||
*/
|
||||
|
||||
#include <gtkmm/spinbutton.h>
|
||||
#include "ardour/midi_model.h"
|
||||
#include "ardour_dialog.h"
|
||||
#include "audio_clock.h"
|
||||
|
||||
|
@ -22,8 +22,6 @@
|
||||
#include "canvas/polygon.h"
|
||||
#include "canvas/debug.h"
|
||||
|
||||
#include "midi_region_view.h"
|
||||
#include "public_editor.h"
|
||||
#include "hit.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
|
@ -18,7 +18,10 @@
|
||||
*/
|
||||
|
||||
#include "ardour/midi_automation_list_binder.h"
|
||||
#include "ardour/midi_region.h"
|
||||
|
||||
#include "midi++/midnam_patch.h"
|
||||
|
||||
#include "midi_automation_line.h"
|
||||
#include "midi_time_axis.h"
|
||||
|
||||
|
@ -17,9 +17,12 @@
|
||||
|
||||
*/
|
||||
|
||||
#include "ardour/midi_region.h"
|
||||
#include "automation_line.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
class MidiRegion;
|
||||
}
|
||||
|
||||
/** Stub class so that lines for MIDI AutomationRegionViews can use the correct
|
||||
* MementoCommandBinder.
|
||||
*/
|
||||
|
@ -21,7 +21,7 @@
|
||||
using namespace ARDOUR;
|
||||
|
||||
MidiCutBuffer::MidiCutBuffer (Session* s)
|
||||
: AutomatableSequence<MidiModel::TimeType> (*s)
|
||||
: AutomatableSequence<Evoral::MusicalTime> (*s)
|
||||
, _origin (0)
|
||||
{
|
||||
|
||||
|
@ -19,16 +19,18 @@
|
||||
#ifndef __gtk_ardour_midi_cut_buffer_h__
|
||||
#define __gtk_ardour_midi_cut_buffer_h__
|
||||
|
||||
#include "ardour/midi_model.h"
|
||||
#include "evoral/types.hpp"
|
||||
|
||||
#include "ardour/automatable_sequence.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
class Session;
|
||||
}
|
||||
|
||||
class MidiCutBuffer : public ARDOUR::AutomatableSequence<ARDOUR::MidiModel::TimeType>
|
||||
class MidiCutBuffer : public ARDOUR::AutomatableSequence<Evoral::MusicalTime>
|
||||
{
|
||||
public:
|
||||
typedef ARDOUR::MidiModel::TimeType TimeType;
|
||||
typedef Evoral::MusicalTime TimeType;
|
||||
|
||||
MidiCutBuffer (ARDOUR::Session*);
|
||||
~MidiCutBuffer();
|
||||
|
@ -24,7 +24,6 @@
|
||||
#include "canvas/debug.h"
|
||||
|
||||
#include "note.h"
|
||||
#include "midi_region_view.h"
|
||||
#include "public_editor.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
|
@ -21,13 +21,15 @@
|
||||
|
||||
#include "gtkmm2ext/keyboard.h"
|
||||
|
||||
#include "evoral/Note.hpp"
|
||||
|
||||
#include "canvas/text.h"
|
||||
|
||||
#include "note_base.h"
|
||||
#include "midi_region_view.h"
|
||||
#include "public_editor.h"
|
||||
#include "editing_syms.h"
|
||||
#include "keyboard.h"
|
||||
#include "midi_region_view.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace Gtkmm2ext;
|
||||
|
@ -21,8 +21,9 @@
|
||||
#define __gtk_ardour_note_base_h__
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#include "canvas/types.h"
|
||||
#include "ardour/midi_model.h"
|
||||
#include "evoral/types.hpp"
|
||||
|
||||
#include "rgb_macros.h"
|
||||
#include "ardour_ui.h"
|
||||
@ -54,7 +55,7 @@ namespace ArdourCanvas {
|
||||
class NoteBase : public sigc::trackable
|
||||
{
|
||||
public:
|
||||
typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType;
|
||||
typedef Evoral::Note<Evoral::MusicalTime> NoteType;
|
||||
|
||||
NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
|
||||
virtual ~NoteBase ();
|
||||
|
@ -51,6 +51,7 @@
|
||||
#include "ardour/auditioner.h"
|
||||
#include "ardour/audioregion.h"
|
||||
#include "ardour/audiofilesource.h"
|
||||
#include "ardour/midi_region.h"
|
||||
#include "ardour/smf_source.h"
|
||||
#include "ardour/region_factory.h"
|
||||
#include "ardour/source_factory.h"
|
||||
|
@ -25,17 +25,16 @@
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#include "ardour/ardour.h"
|
||||
#include "ardour/audio_track.h"
|
||||
#include "ardour/midi_region.h"
|
||||
|
||||
#include "ardour/audio_diskstream.h"
|
||||
#include "ardour/midi_diskstream.h"
|
||||
#include "ardour/track.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
class Session;
|
||||
class AudioDiskstream;
|
||||
class AudioRegion;
|
||||
class AudioPlaylist;
|
||||
class MidiDiskstream;
|
||||
class MidiRegion;
|
||||
|
||||
class LIBARDOUR_API Auditioner : public Track
|
||||
{
|
||||
@ -103,12 +102,8 @@ class LIBARDOUR_API Auditioner : public Track
|
||||
boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &)
|
||||
{ return boost::shared_ptr<Diskstream> (); }
|
||||
|
||||
boost::shared_ptr<AudioDiskstream> audio_diskstream() const
|
||||
{ return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream); }
|
||||
|
||||
boost::shared_ptr<MidiDiskstream> midi_diskstream() const
|
||||
{ return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream); }
|
||||
|
||||
boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
|
||||
boost::shared_ptr<MidiDiskstream> midi_diskstream() const;
|
||||
|
||||
private:
|
||||
boost::shared_ptr<AudioRegion> the_region;
|
||||
|
@ -37,7 +37,6 @@
|
||||
#include "ardour/ardour.h"
|
||||
#include "ardour/diskstream.h"
|
||||
#include "ardour/midi_buffer.h"
|
||||
#include "ardour/midi_playlist.h"
|
||||
#include "ardour/utils.h"
|
||||
|
||||
struct tm;
|
||||
@ -46,6 +45,7 @@ namespace ARDOUR {
|
||||
|
||||
class IO;
|
||||
class MidiEngine;
|
||||
class MidiPlaylist;
|
||||
class MidiPort;
|
||||
class MidiRingbuffer;
|
||||
class MidiSource;
|
||||
@ -53,6 +53,8 @@ class SMFSource;
|
||||
class Send;
|
||||
class Session;
|
||||
|
||||
template<typename T> class MidiRingBuffer;
|
||||
|
||||
class LIBARDOUR_API MidiDiskstream : public Diskstream
|
||||
{
|
||||
public:
|
||||
@ -70,7 +72,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
|
||||
|
||||
void reset_tracker ();
|
||||
|
||||
boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); }
|
||||
boost::shared_ptr<MidiPlaylist> midi_playlist ();
|
||||
|
||||
int use_playlist (boost::shared_ptr<Playlist>);
|
||||
int use_new_playlist ();
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include "pbd/command.h"
|
||||
#include "ardour/libardour_visibility.h"
|
||||
#include "ardour/types.h"
|
||||
#include "ardour/midi_buffer.h"
|
||||
#include "ardour/automatable_sequence.h"
|
||||
#include "ardour/libardour_visibility.h"
|
||||
#include "ardour/types.h"
|
||||
|
@ -24,10 +24,10 @@
|
||||
#include "midi++/parser.h"
|
||||
|
||||
#include "ardour/port.h"
|
||||
#include "ardour/midi_buffer.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
class MidiBuffer;
|
||||
class MidiEngine;
|
||||
|
||||
class LIBARDOUR_API MidiPort : public Port {
|
||||
@ -51,9 +51,7 @@ class LIBARDOUR_API MidiPort : public Port {
|
||||
bool input_active() const { return _input_active; }
|
||||
void set_input_active (bool yn);
|
||||
|
||||
Buffer& get_buffer (pframes_t nframes) {
|
||||
return get_midi_buffer (nframes);
|
||||
}
|
||||
Buffer& get_buffer (pframes_t nframes);
|
||||
|
||||
MidiBuffer& get_midi_buffer (pframes_t nframes);
|
||||
|
||||
@ -85,7 +83,7 @@ class LIBARDOUR_API MidiPort : public Port {
|
||||
|
||||
MIDI::Parser _self_parser;
|
||||
|
||||
void resolve_notes (void* buffer, MidiBuffer::TimeType when);
|
||||
void resolve_notes (void* buffer, framepos_t when);
|
||||
};
|
||||
|
||||
} // namespace ARDOUR
|
||||
|
@ -27,6 +27,8 @@
|
||||
namespace ARDOUR
|
||||
{
|
||||
|
||||
class MIDISceneChange;
|
||||
|
||||
class MIDISceneChanger : public SceneChanger
|
||||
{
|
||||
public:
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include "pbd/signals.h"
|
||||
|
||||
#include "ardour/location.h"
|
||||
#include "ardour/midi_scene_change.h"
|
||||
#include "ardour/session_handle.h"
|
||||
#include "ardour/types.h"
|
||||
|
||||
|
@ -22,13 +22,16 @@
|
||||
#include "pbd/error.h"
|
||||
|
||||
#include "ardour/amp.h"
|
||||
#include "ardour/audioregion.h"
|
||||
#include "ardour/audio_diskstream.h"
|
||||
#include "ardour/audio_port.h"
|
||||
#include "ardour/audioengine.h"
|
||||
#include "ardour/audioplaylist.h"
|
||||
#include "ardour/audioregion.h"
|
||||
#include "ardour/auditioner.h"
|
||||
#include "ardour/audio_port.h"
|
||||
#include "ardour/data_type.h"
|
||||
#include "ardour/delivery.h"
|
||||
#include "ardour/midi_diskstream.h"
|
||||
#include "ardour/midi_region.h"
|
||||
#include "ardour/plugin.h"
|
||||
#include "ardour/plugin_insert.h"
|
||||
#include "ardour/region_factory.h"
|
||||
@ -604,3 +607,15 @@ Auditioner::monitoring_state () const
|
||||
{
|
||||
return MonitoringDisk;
|
||||
}
|
||||
|
||||
boost::shared_ptr<AudioDiskstream>
|
||||
Auditioner::audio_diskstream() const
|
||||
{
|
||||
return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream);
|
||||
}
|
||||
|
||||
boost::shared_ptr<MidiDiskstream>
|
||||
Auditioner::midi_diskstream() const
|
||||
{
|
||||
return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream);
|
||||
}
|
||||
|
@ -1487,3 +1487,9 @@ MidiDiskstream::reset_tracker ()
|
||||
mp->clear_note_trackers ();
|
||||
}
|
||||
}
|
||||
|
||||
boost::shared_ptr<MidiPlaylist>
|
||||
MidiDiskstream::midi_playlist ()
|
||||
{
|
||||
return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist);
|
||||
}
|
||||
|
@ -22,10 +22,11 @@
|
||||
#include "pbd/compose.h"
|
||||
#include "pbd/debug.h"
|
||||
|
||||
#include "ardour/midi_port.h"
|
||||
#include "ardour/data_type.h"
|
||||
#include "ardour/audioengine.h"
|
||||
#include "ardour/data_type.h"
|
||||
#include "ardour/debug.h"
|
||||
#include "ardour/midi_buffer.h"
|
||||
#include "ardour/midi_port.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace ARDOUR;
|
||||
@ -80,6 +81,12 @@ MidiPort::cycle_start (pframes_t nframes)
|
||||
}
|
||||
}
|
||||
|
||||
Buffer&
|
||||
MidiPort::get_buffer (pframes_t nframes)
|
||||
{
|
||||
return get_midi_buffer (nframes);
|
||||
}
|
||||
|
||||
MidiBuffer &
|
||||
MidiPort::get_midi_buffer (pframes_t nframes)
|
||||
{
|
||||
|
@ -24,6 +24,7 @@
|
||||
|
||||
#include "ardour/async_midi_port.h"
|
||||
#include "ardour/event_type_map.h"
|
||||
#include "ardour/midi_buffer.h"
|
||||
#include "ardour/midi_port.h"
|
||||
#include "ardour/midi_scene_change.h"
|
||||
#include "ardour/midi_scene_changer.h"
|
||||
|
Loading…
Reference in New Issue
Block a user