projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP whitespace
[ardour.git]
/
gtk2_ardour
/
editor_drag.h
diff --git
a/gtk2_ardour/editor_drag.h
b/gtk2_ardour/editor_drag.h
index 5b5ca6d432139f9efe9c07b70c12773fde21ce38..cc0e9d95ddc7761725b48818114ec315ac3f39fc 100644
(file)
--- a/
gtk2_ardour/editor_drag.h
+++ b/
gtk2_ardour/editor_drag.h
@@
-37,6
+37,7
@@
namespace ARDOUR {
class Location;
namespace ARDOUR {
class Location;
+ class TempoSection;
}
namespace ArdourCanvas {
}
namespace ArdourCanvas {
@@
-247,7
+248,7
@@
protected:
/* sets snap delta from unsnapped pos */
void setup_snap_delta (framepos_t pos);
/* sets snap delta from unsnapped pos */
void setup_snap_delta (framepos_t pos);
- boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*, bool commit);
+ boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*, bool commit
, const int32_t sub_num
);
void show_verbose_cursor_time (framepos_t);
void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0);
void show_verbose_cursor_time (framepos_t);
void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0);
@@
-406,13
+407,15
@@
private:
void finished_no_copy (
bool const,
bool const,
void finished_no_copy (
bool const,
bool const,
- ARDOUR::framecnt_t const
+ ARDOUR::framecnt_t const,
+ int32_t const ev_state
);
void finished_copy (
bool const,
bool const,
);
void finished_copy (
bool const,
bool const,
- ARDOUR::framecnt_t const
+ ARDOUR::framecnt_t const,
+ int32_t const ev_state
);
RegionView* insert_region_into_playlist (
);
RegionView* insert_region_into_playlist (
@@
-420,7
+423,8
@@
private:
RouteTimeAxisView*,
ARDOUR::layer_t,
ARDOUR::framecnt_t,
RouteTimeAxisView*,
ARDOUR::layer_t,
ARDOUR::framecnt_t,
- PlaylistSet&
+ PlaylistSet&,
+ const int32_t sub_num
);
void remove_region_from_playlist (
);
void remove_region_from_playlist (
@@
-708,6
+712,8
@@
private:
ARDOUR::MeterSection* _real_section;
bool _copy;
ARDOUR::MeterSection* _real_section;
bool _copy;
+ Editing::SnapType _old_snap_type;
+ Editing::SnapMode _old_snap_mode;
XMLNode* before_state;
};
XMLNode* before_state;
};
@@
-763,7
+769,8
@@
public:
void setup_pointer_frame_offset ();
private:
void setup_pointer_frame_offset ();
private:
-
+ double _pulse;
+ ARDOUR::TempoSection* _tempo;
XMLNode* before_state;
};
XMLNode* before_state;
};