fix manual errors during rebase against master
This commit is contained in:
parent
776d8590f9
commit
848e0e0a10
@ -199,6 +199,18 @@ enum InsertTimeOption {
|
||||
#undef INSERTTIMEOPT
|
||||
#define INSERTTIMEOPT(a) /*empty*/
|
||||
|
||||
#undef NOTENAMEDISPLAY
|
||||
#define NOTENAMEDISPLAY(a) a,
|
||||
enum NoteNameDisplay {
|
||||
#include "editing_syms.h"
|
||||
};
|
||||
|
||||
extern const char *notenamedisplaystrs[];
|
||||
inline const char* enum2str(NoteNameDisplay m) {return notenamedisplaystrs[m];}
|
||||
|
||||
#undef NOTENAMEDISPLAY
|
||||
#define NOTENAMEDISPLAY(a) /*empty*/
|
||||
|
||||
/////////////////////
|
||||
// These don't need their state saved. yet...
|
||||
enum CutCopyOp {
|
||||
|
@ -109,3 +109,7 @@ EDITPOINT(EditAtMouse)
|
||||
INSERTTIMEOPT(LeaveIntersected)
|
||||
INSERTTIMEOPT(MoveIntersected)
|
||||
INSERTTIMEOPT(SplitIntersected)
|
||||
|
||||
NOTENAMEDISPLAY(Always)
|
||||
NOTENAMEDISPLAY(WithMIDNAM)
|
||||
NOTENAMEDISPLAY(Never)
|
||||
|
@ -1180,7 +1180,6 @@ Editor::draw_channel_action (int c)
|
||||
{
|
||||
char buf[64];
|
||||
const char* action = 0;
|
||||
char buf[64];
|
||||
RefPtr<Action> act;
|
||||
|
||||
if (c==DRAW_CHAN_AUTO) {
|
||||
|
@ -60,6 +60,7 @@ setup_gtk_ardour_enums ()
|
||||
StartupFSM::DialogID startup_dialog;
|
||||
Gtk::ResponseType dialog_response;
|
||||
AddRouteDialog::TypeWanted type_wanted;
|
||||
NoteNameDisplay note_name_display;
|
||||
|
||||
#define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
|
||||
#define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
|
||||
|
Loading…
Reference in New Issue
Block a user