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

Trim dependence on evoral types.hpp and Beats.hpp

Browse source
This commit is contained in:
David Robillard 2015-10-05 13:58:35 -04:00
parent ea354226c1
commit eaca325ce8
31 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/midi_cut_buffer.h
View file

@ -19,7 +19,7 @@
#ifndef __gtk_ardour_midi_cut_buffer_h__ #ifndef __gtk_ardour_midi_cut_buffer_h__
#define __gtk_ardour_midi_cut_buffer_h__ #define __gtk_ardour_midi_cut_buffer_h__
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "ardour/automatable_sequence.h" #include "ardour/automatable_sequence.h"

3
gtk2_ardour/midi_list_editor.h
View file

@ -25,14 +25,13 @@
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include "evoral/types.hpp"
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "ardour_window.h" #include "ardour_window.h"
namespace Evoral { namespace Evoral {
template<typename Time> class Note; template<typename Time> class Note;
class Beats;
}; };
namespace ARDOUR { namespace ARDOUR {

2
gtk2_ardour/note_base.h
View file

@ -23,7 +23,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "canvas/types.h" #include "canvas/types.h"
#include "evoral/types.hpp"
#include "rgb_macros.h" #include "rgb_macros.h"
#include "ui_config.h" #include "ui_config.h"
@ -33,6 +32,7 @@ class MidiRegionView;
namespace Evoral { namespace Evoral {
template<typename T> class Note; template<typename T> class Note;
class Beats;
} }
namespace ArdourCanvas { namespace ArdourCanvas {

2
gtk2_ardour/public_editor.h
View file

@ -35,8 +35,8 @@
#include <gtkmm/notebook.h> #include <gtkmm/notebook.h>
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include "evoral/Beats.hpp"
#include "evoral/Note.hpp" #include "evoral/Note.hpp"
#include "evoral/types.hpp"
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"

1
gtk2_ardour/quantize_dialog.h
View file

@ -27,7 +27,6 @@
#include <gtkmm/checkbutton.h> #include <gtkmm/checkbutton.h>
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
#include "evoral/types.hpp"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"

2
gtk2_ardour/step_editor.h
View file

@ -25,7 +25,7 @@
#include <sigc++/trackable.h> #include <sigc++/trackable.h>
#include "pbd/signals.h" #include "pbd/signals.h"
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
namespace ARDOUR { namespace ARDOUR {
class MidiTrack; class MidiTrack;

1
gtk2_ardour/transform_dialog.h
View file

@ -31,7 +31,6 @@
#include "ardour/midi_model.h" #include "ardour/midi_model.h"
#include "ardour/transform.h" #include "ardour/transform.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "evoral/types.hpp"
#include "ardour_dialog.h" #include "ardour_dialog.h"

1
libs/ardour/ardour/automation_control.h
View file

@ -24,7 +24,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include "evoral/types.hpp"
#include "pbd/controllable.h" #include "pbd/controllable.h"
#include "evoral/Control.hpp" #include "evoral/Control.hpp"

2
libs/ardour/ardour/beats_frames_converter.h
View file

@ -19,8 +19,8 @@
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $ $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/ */
#include "evoral/Beats.hpp"
#include "evoral/TimeConverter.hpp" #include "evoral/TimeConverter.hpp"
#include "evoral/types.hpp"
#include "ardour/libardour_visibility.h" #include "ardour/libardour_visibility.h"
#include "ardour/types.h" #include "ardour/types.h"

2
libs/ardour/ardour/diskstream.h
View file

@ -29,7 +29,7 @@
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include "evoral/types.hpp" #include "evoral/Range.hpp"
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/chan_count.h" #include "ardour/chan_count.h"

2
libs/ardour/ardour/midi_operator.h
View file

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "evoral/Sequence.hpp" #include "evoral/Sequence.hpp"
class Command; class Command;

2
libs/ardour/ardour/midi_playlist.h
View file

@ -30,12 +30,12 @@
#include "ardour/midi_state_tracker.h" #include "ardour/midi_state_tracker.h"
#include "ardour/note_fixer.h" #include "ardour/note_fixer.h"
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "evoral/Beats.hpp"
#include "evoral/Note.hpp" #include "evoral/Note.hpp"
#include "evoral/Parameter.hpp" #include "evoral/Parameter.hpp"
namespace Evoral { namespace Evoral {
template<typename Time> class EventSink; template<typename Time> class EventSink;
class Beats;
} }
namespace ARDOUR namespace ARDOUR

2
libs/ardour/ardour/midi_region.h
View file

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/region.h" #include "ardour/region.h"

2
libs/ardour/ardour/playlist.h
View file

@ -38,7 +38,7 @@
#include "pbd/sequence_property.h" #include "pbd/sequence_property.h"
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"
#include "evoral/types.hpp" #include "evoral/Range.hpp"
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/region.h" #include "ardour/region.h"

2
libs/ardour/ardour/session.h
View file

@ -49,7 +49,7 @@
#include "lua/luastate.h" #include "lua/luastate.h"
#include "evoral/types.hpp" #include "evoral/Range.hpp"
#include "midi++/types.h" #include "midi++/types.h"
#include "midi++/mmc.h" #include "midi++/mmc.h"

2
libs/ardour/ardour/tempo.h
View file

@ -30,7 +30,7 @@
#include "pbd/stateful.h" #include "pbd/stateful.h"
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "ardour/ardour.h" #include "ardour/ardour.h"

2
libs/ardour/ardour/variant.h
View file

@ -27,7 +27,7 @@
#include <stdexcept> #include <stdexcept>
#include "ardour/libardour_visibility.h" #include "ardour/libardour_visibility.h"
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "pbd/compose.h" #include "pbd/compose.h"
namespace ARDOUR { namespace ARDOUR {

2
libs/ardour/midi_region.cc
View file

@ -28,7 +28,7 @@
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/basename.h" #include "pbd/basename.h"

2
libs/ardour/tempo.cc
View file

@ -25,7 +25,7 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "evoral/types.hpp" #include "evoral/Beats.hpp"
#include "ardour/debug.h" #include "ardour/debug.h"
#include "ardour/lmath.h" #include "ardour/lmath.h"
#include "ardour/tempo.h" #include "ardour/tempo.h"

1
libs/evoral/evoral/ControlList.hpp
View file

@ -31,7 +31,6 @@
#include "pbd/signals.h" #include "pbd/signals.h"
#include "evoral/visibility.h" #include "evoral/visibility.h"
#include "evoral/types.hpp"
#include "evoral/Range.hpp" #include "evoral/Range.hpp"
#include "evoral/Parameter.hpp" #include "evoral/Parameter.hpp"
#include "evoral/ParameterDescriptor.hpp" #include "evoral/ParameterDescriptor.hpp"

1
libs/evoral/evoral/ControlSet.hpp
View file

@ -27,7 +27,6 @@
#include "pbd/signals.h" #include "pbd/signals.h"
#include "evoral/visibility.h" #include "evoral/visibility.h"
#include "evoral/types.hpp"
#include "evoral/Parameter.hpp" #include "evoral/Parameter.hpp"
#include "evoral/ControlList.hpp" #include "evoral/ControlList.hpp"

5
libs/evoral/evoral/EventList.hpp
View file

@ -20,10 +20,9 @@
#include <list> #include <list>
#include "evoral/visibility.h"
#include "evoral/EventSink.hpp"
#include "evoral/types.hpp"
#include "evoral/Event.hpp" #include "evoral/Event.hpp"
#include "evoral/EventSink.hpp"
#include "evoral/visibility.h"
namespace Evoral { namespace Evoral {

1
libs/evoral/evoral/Sequence.hpp
View file

@ -28,7 +28,6 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include "evoral/visibility.h" #include "evoral/visibility.h"
#include "evoral/types.hpp"
#include "evoral/Note.hpp" #include "evoral/Note.hpp"
#include "evoral/ControlSet.hpp" #include "evoral/ControlSet.hpp"
#include "evoral/ControlList.hpp" #include "evoral/ControlList.hpp"

6
libs/evoral/evoral/types.hpp
View file

@ -27,11 +27,7 @@
#include <limits> #include <limits>
#include <list> #include <list>
#include "pbd/debug.h"
#include "evoral/Beats.hpp"
#include "evoral/visibility.h" #include "evoral/visibility.h"
#include "pbd/debug.h" #include "pbd/debug.h"
namespace Evoral { namespace Evoral {
@ -44,6 +40,8 @@ typedef int32_t event_id_t;
/** Type of an event (opaque, mapped by application) */ /** Type of an event (opaque, mapped by application) */
typedef uint32_t EventType; typedef uint32_t EventType;
class Beats;
} // namespace Evoral } // namespace Evoral
namespace PBD { namespace PBD {

1
libs/evoral/src/ControlList.cpp
View file

@ -36,6 +36,7 @@
#include "evoral/Curve.hpp" #include "evoral/Curve.hpp"
#include "evoral/ParameterDescriptor.hpp" #include "evoral/ParameterDescriptor.hpp"
#include "evoral/TypeMap.hpp" #include "evoral/TypeMap.hpp"
#include "evoral/types.hpp"
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/debug.h" #include "pbd/debug.h"

2
libs/evoral/src/Event.cpp
View file

@ -17,7 +17,9 @@
*/ */
#include <glib.h> #include <glib.h>
#include "evoral/Event.hpp" #include "evoral/Event.hpp"
#include "evoral/Beats.hpp"
namespace Evoral { namespace Evoral {

1
libs/evoral/src/MIDIEvent.cpp
View file

@ -17,6 +17,7 @@
*/ */
#include <string> #include <string>
#include "evoral/Beats.hpp"
#include "evoral/MIDIEvent.hpp" #include "evoral/MIDIEvent.hpp"
#ifdef EVORAL_MIDI_XML #ifdef EVORAL_MIDI_XML
#include "pbd/xml++.h" #include "pbd/xml++.h"

2
libs/evoral/src/Note.cpp
View file

@ -23,6 +23,8 @@
#include "evoral/Note.hpp" #include "evoral/Note.hpp"
#endif #endif
#include "evoral/Beats.hpp"
namespace Evoral { namespace Evoral {
template<typename Time> template<typename Time>

1
libs/evoral/src/Sequence.cpp
View file

@ -31,6 +31,7 @@
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/error.h" #include "pbd/error.h"
#include "evoral/Beats.hpp"
#include "evoral/Control.hpp" #include "evoral/Control.hpp"
#include "evoral/ControlList.hpp" #include "evoral/ControlList.hpp"
#include "evoral/ControlSet.hpp" #include "evoral/ControlSet.hpp"

1
libs/evoral/src/types.cpp
View file

@ -18,6 +18,7 @@
#include <limits.h> #include <limits.h>
#include "evoral/Beats.hpp"
#include "evoral/types.hpp" #include "evoral/types.hpp"
namespace Evoral { namespace Evoral {

1
libs/evoral/test/SequenceTest.hpp
View file

@ -2,6 +2,7 @@
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include "evoral/Beats.hpp"
#include "evoral/Sequence.hpp" #include "evoral/Sequence.hpp"
#include "evoral/TypeMap.hpp" #include "evoral/TypeMap.hpp"
#include "evoral/EventSink.hpp" #include "evoral/EventSink.hpp"