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

fix manual errors during rebase against master

This commit is contained in:
Paul Davis 2023-09-06 19:36:26 -06:00
parent 776d8590f9
commit 848e0e0a10
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/editing.h
View File

@ -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 {

4
gtk2_ardour/editing_syms.h
View File

@ -109,3 +109,7 @@ EDITPOINT(EditAtMouse)
INSERTTIMEOPT(LeaveIntersected)
INSERTTIMEOPT(MoveIntersected)
INSERTTIMEOPT(SplitIntersected)
NOTENAMEDISPLAY(Always)
NOTENAMEDISPLAY(WithMIDNAM)
NOTENAMEDISPLAY(Never)

1
gtk2_ardour/editor_actions.cc
View File

@ -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) {

1
gtk2_ardour/enums.cc
View File

@ -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()