summaryrefslogtreecommitdiff
path: root/gtk2_ardour/step_editor.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-01-07 20:12:14 -0500
committerDavid Robillard <d@drobilla.net>2015-01-07 20:12:14 -0500
commit69069e038126b0837853b913e8aebcd6cc0c5f3a (patch)
treed0cd1ca78295e0b5cdce4dae9c030abef2bc2c06 /gtk2_ardour/step_editor.h
parente705e93376427d15def4d64ee955b6e29a096765 (diff)
Fix whitespace (noop).
Diffstat (limited to 'gtk2_ardour/step_editor.h')
-rw-r--r--gtk2_ardour/step_editor.h91
1 files changed, 45 insertions, 46 deletions
diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index 299025d292..fa2f294d9d 100644
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -14,11 +14,10 @@
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 __pbd__step_editor_h__
-#define __pbd__step_editor_h__
+#ifndef __gtk2_ardour_step_editor_h__
+#define __gtk2_ardour_step_editor_h__
#include <string>
@@ -29,8 +28,8 @@
#include "evoral/types.hpp"
namespace ARDOUR {
- class MidiTrack;
- class MidiRegion;
+class MidiTrack;
+class MidiRegion;
}
class MidiRegionView;
@@ -40,55 +39,55 @@ class StepEntry;
class StepEditor : public PBD::ScopedConnectionList, public sigc::trackable
{
- public:
- StepEditor (PublicEditor&, boost::shared_ptr<ARDOUR::MidiTrack>, MidiTimeAxisView&);
- virtual ~StepEditor ();
+public:
+ StepEditor (PublicEditor&, boost::shared_ptr<ARDOUR::MidiTrack>, MidiTimeAxisView&);
+ virtual ~StepEditor ();
void check_step_edit ();
void step_edit_rest (Evoral::Beats beats);
- void step_edit_beat_sync ();
- void step_edit_bar_sync ();
- int step_add_bank_change (uint8_t channel, uint8_t bank);
- int step_add_program_change (uint8_t channel, uint8_t program);
- int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
- Evoral::Beats beat_duration);
- void step_edit_sustain (Evoral::Beats beats);
- bool step_edit_within_triplet () const;
- void step_edit_toggle_triplet ();
- bool step_edit_within_chord () const;
- void step_edit_toggle_chord ();
- void reset_step_edit_beat_pos ();
- void resync_step_edit_to_edit_point ();
- void move_step_edit_beat_pos (Evoral::Beats beats);
- void set_step_edit_cursor_width (Evoral::Beats beats);
-
- std::string name() const;
+ void step_edit_beat_sync ();
+ void step_edit_bar_sync ();
+ int step_add_bank_change (uint8_t channel, uint8_t bank);
+ int step_add_program_change (uint8_t channel, uint8_t program);
+ int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
+ Evoral::Beats beat_duration);
+ void step_edit_sustain (Evoral::Beats beats);
+ bool step_edit_within_triplet () const;
+ void step_edit_toggle_triplet ();
+ bool step_edit_within_chord () const;
+ void step_edit_toggle_chord ();
+ void reset_step_edit_beat_pos ();
+ void resync_step_edit_to_edit_point ();
+ void move_step_edit_beat_pos (Evoral::Beats beats);
+ void set_step_edit_cursor_width (Evoral::Beats beats);
+
+ std::string name() const;
void start_step_editing ();
void stop_step_editing ();
- private:
- ARDOUR::framepos_t step_edit_insert_position;
- Evoral::Beats step_edit_beat_pos;
+private:
+ ARDOUR::framepos_t step_edit_insert_position;
+ Evoral::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;
- Evoral::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;
- Evoral::Beats last_added_end;
-
- void region_removed (boost::weak_ptr<ARDOUR::Region>);
- void playlist_changed ();
- bool step_editor_hidden (GdkEventAny*);
- void step_editor_hide ();
- void resync_step_edit_position ();
- void prepare_step_edit_region ();
+ uint8_t _step_edit_triplet_countdown;
+ bool _step_edit_within_chord;
+ Evoral::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;
+ Evoral::Beats last_added_end;
+
+ void region_removed (boost::weak_ptr<ARDOUR::Region>);
+ void playlist_changed ();
+ bool step_editor_hidden (GdkEventAny*);
+ void step_editor_hide ();
+ void resync_step_edit_position ();
+ void prepare_step_edit_region ();
};
-#endif /* __pbd__step_editor_h__ */
+#endif /* __gtk2_ardour_step_editor_h__ */