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

fix header order and space alignment

This commit is contained in:
Paul Davis 2017-09-24 12:57:27 -04:00
parent 7db12f6b12
commit b9c6ffac21
24 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/hit.cc
View File

@ -18,6 +18,7 @@
*/
#include "temporal/beats.h"
#include "evoral/Note.hpp"
#include "canvas/polygon.h"

4
gtk2_ardour/midi_region_view.cc
View File

@ -3476,7 +3476,7 @@ MidiRegionView::nudge_notes (bool forward, bool fine)
*/
const samplepos_t ref_point = source_beats_to_absolute_samples ((*(_selection.begin()))->note()->time());
Temporal::Beats delta;
Temporal::Beats delta;
if (!fine) {
@ -3786,7 +3786,7 @@ MidiRegionView::paste_internal (samplepos_t pos, unsigned paste_count, float tim
const Temporal::Beats snap_duration = duration.snap_to(snap_beats);
const Temporal::Beats paste_offset = snap_duration * paste_count;
const Temporal::Beats quarter_note = absolute_samples_to_source_beats(pos) + paste_offset;
Temporal::Beats end_point = Temporal::Beats();
Temporal::Beats end_point = Temporal::Beats();
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6)\n",
first_time,

4
gtk2_ardour/midi_region_view.h
View File

@ -436,8 +436,8 @@ private:
double _last_ghost_x;
double _last_ghost_y;
ArdourCanvas::Rectangle* _step_edit_cursor;
Temporal::Beats _step_edit_cursor_width;
Temporal::Beats _step_edit_cursor_position;
Temporal::Beats _step_edit_cursor_width;
Temporal::Beats _step_edit_cursor_position;
NoteBase* _channel_selection_scoped_note;
MouseState _mouse_state;

7
gtk2_ardour/public_editor.h
View File

@ -35,11 +35,12 @@
#include <gtkmm/notebook.h>
#include <sigc++/signal.h>
#include "temporal/beats.h"
#include "evoral/Note.hpp"
#include "pbd/statefuldestructible.h"
#include "temporal/beats.h"
#include "evoral/Note.hpp"
#include "ardour/session_handle.h"
#include "canvas/fwd.h"

7
gtk2_ardour/step_editor.h
View File

@ -25,6 +25,7 @@
#include <sigc++/trackable.h>
#include "pbd/signals.h"
#include "temporal/beats.h"
namespace ARDOUR {
@ -68,19 +69,19 @@ public:
private:
ARDOUR::samplepos_t step_edit_insert_position;
Temporal::Beats step_edit_beat_pos;
Temporal::Beats step_edit_beat_pos;
boost::shared_ptr<ARDOUR::MidiRegion> step_edit_region;
MidiRegionView* step_edit_region_view;
uint8_t _step_edit_triplet_countdown;
bool _step_edit_within_chord;
Temporal::Beats _step_edit_chord_duration;
Temporal::Beats _step_edit_chord_duration;
PBD::ScopedConnection step_edit_region_connection;
PublicEditor& _editor;
boost::shared_ptr<ARDOUR::MidiTrack> _track;
StepEntry* step_editor;
MidiTimeAxisView& _mtv;
int8_t last_added_pitch;
Temporal::Beats last_added_end;
Temporal::Beats last_added_end;
void region_removed (boost::weak_ptr<ARDOUR::Region>);
void playlist_changed ();

2
libs/ardour/ardour/legatize.h
View File

@ -42,7 +42,7 @@ public:
typedef Evoral::Sequence<Temporal::Beats>::Notes Notes;
Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Notes>& seqs);
std::string name () const { return (_shrink_only ? std::string ("remove overlap") : std::string ("legatize")); }

8
libs/ardour/ardour/midi_cursor.h
View File

@ -24,10 +24,14 @@
#include <boost/utility.hpp>
#include "ardour/types.h"
#include "pbd/signals.h"
#include "temporal/beats.h"
#include "evoral/Sequence.hpp"
#include "pbd/signals.h"
#include "ardour/types.h"
namespace ARDOUR {

4
libs/ardour/ardour/midi_model.h
View File

@ -265,8 +265,8 @@ public:
bool write_section_to(boost::shared_ptr<MidiSource> source,
const Glib::Threads::Mutex::Lock& source_lock,
Temporal::Beats begin = Temporal::Beats(),
Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max(),
Temporal::Beats begin = Temporal::Beats(),
Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max(),
bool offset_events = false);
// MidiModel doesn't use the normal AutomationList serialisation code

10
libs/ardour/ardour/midi_source.h
View File

@ -62,8 +62,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
*/
int write_to (const Lock& lock,
boost::shared_ptr<MidiSource> newsrc,
Temporal::Beats begin = Temporal::Beats(),
Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max());
Temporal::Beats begin = Temporal::Beats(),
Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max());
/** Export the midi data in the given time range to another MidiSource
* \param newsrc MidiSource to which data will be written. Should be a
@ -75,8 +75,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
*/
int export_write_to (const Lock& lock,
boost::shared_ptr<MidiSource> newsrc,
Temporal::Beats begin,
Temporal::Beats end);
Temporal::Beats begin,
Temporal::Beats end);
/** Read the data in a given time range from the MIDI source.
* All time stamps in parameters are in audio samples (even if the source has tempo time).
@ -156,7 +156,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
virtual void mark_midi_streaming_write_completed (
const Lock& lock,
Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option,
Temporal::Beats when = Temporal::Beats());
Temporal::Beats when = Temporal::Beats());
virtual void session_saved();

6
libs/ardour/ardour/note_fixer.h
View File

@ -24,10 +24,12 @@
#include <boost/utility.hpp>
#include "temporal/beats.h"
#include "evoral/Note.hpp"
#include "ardour/midi_model.h"
#include "ardour/types.h"
#include "temporal/beats.h"
#include "evoral/Note.hpp"
namespace Evoral { template<typename Time> class EventSink; }

2
libs/ardour/ardour/smf_source.h
View File

@ -78,7 +78,7 @@ public:
private:
bool _open;
Temporal::Beats _last_ev_time_beats;
Temporal::Beats _last_ev_time_beats;
samplepos_t _last_ev_time_samples;
/** end time (start + duration) of last call to read_unlocked */
mutable samplepos_t _smf_last_read_end;

2
libs/ardour/ardour/transform.h
View File

@ -132,7 +132,7 @@ public:
Transform(const Program& prog);
Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Notes>& seqs);
std::string name() const { return std::string ("transform"); }

2
libs/ardour/ardour/transpose.h
View File

@ -34,7 +34,7 @@ public:
Transpose (int semitones);
Command* operator() (boost::shared_ptr<ARDOUR::MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Notes>& seqs);
std::string name () const { return std::string ("transpose"); }

2
libs/ardour/legatize.cc
View File

@ -31,7 +31,7 @@ Legatize::~Legatize ()
Command*
Legatize::operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Legatize::Notes>& seqs)
{
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand(model, name ());

1
libs/ardour/ltc_file_reader.cc
View File

@ -30,6 +30,7 @@
#include "pbd/failed_constructor.h"
#include "temporal/time.h"
#include "ardour/ltc_file_reader.h"
#include "pbd/i18n.h"

4
libs/ardour/luabindings.cc
View File

@ -18,9 +18,11 @@
#include <glibmm.h>
#include "temporal/bbt_time.h"
#include "pbd/stateful_diff_command.h"
#include "pbd/openuri.h"
#include "temporal/bbt_time.h"
#include "evoral/Control.hpp"
#include "evoral/ControlList.hpp"
#include "evoral/Range.hpp"

2
libs/ardour/midi_source.cc
View File

@ -357,7 +357,7 @@ MidiSource::mark_streaming_write_started (const Lock& lock)
void
MidiSource::mark_midi_streaming_write_completed (const Lock& lock,
Evoral::Sequence<Temporal::Beats>::StuckNoteOption option,
Temporal::Beats end)
Temporal::Beats end)
{
if (_model) {
_model->end_write (option, end);

1
libs/ardour/tempo.cc
View File

@ -27,6 +27,7 @@
#include "pbd/enumwriter.h"
#include "pbd/xml++.h"
#include "temporal/beats.h"
#include "ardour/debug.h"

2
libs/ardour/transform.cc
View File

@ -121,7 +121,7 @@ Transform::Operation::eval(Context& ctx) const
Command*
Transform::operator()(boost::shared_ptr<MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Notes>& seqs)
{
typedef MidiModel::NoteDiffCommand Command;

2
libs/ardour/transpose.cc
View File

@ -27,7 +27,7 @@ Transpose::Transpose(int semitones)
Command*
Transpose::operator()(boost::shared_ptr<MidiModel> model,
Temporal::Beats position,
Temporal::Beats position,
std::vector<Notes>& seqs)
{
typedef MidiModel::NoteDiffCommand Command;

1
libs/surfaces/push2/mix.cc
View File

@ -28,6 +28,7 @@
#include "pbd/enumwriter.h"
#include "midi++/parser.h"
#include "temporal/time.h"
#include "temporal/bbt_time.h"

1
libs/surfaces/push2/push2.cc
View File

@ -28,6 +28,7 @@
#include "pbd/enumwriter.h"
#include "midi++/parser.h"
#include "temporal/time.h"
#include "temporal/bbt_time.h"

1
libs/surfaces/push2/track_mix.cc
View File

@ -29,6 +29,7 @@
#include "pbd/enumwriter.h"
#include "midi++/parser.h"
#include "temporal/time.h"
#include "temporal/bbt_time.h"

2
nutemp/t.h
View File

@ -290,7 +290,7 @@ class LIBARDOUR_API TempoMapPoint
ExplicitInfo _explicit;
};
superclock_t _sclock;
Temporal::Beats _quarters;
Temporal::Beats _quarters;
Timecode::BBT_Time _bbt;
bool _dirty;
TempoMap* _map;