smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Remove duplicate symbol ColumnInfo from global namespace #8637

Browse source
This commit is contained in:
Robin Gareus 2021-03-28 04:31:11 +02:00
parent 9c4a8ba528
commit 09d9938ecd
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/editor_regions.cc
View file

@ -72,14 +72,6 @@ using namespace Glib;
using namespace Editing; using namespace Editing;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
struct ColumnInfo {
int index;
int sort_idx;
Gtk::AlignmentEnum al;
const char* label;
const char* tooltip;
};
//#define SHOW_REGION_EXTRAS //#define SHOW_REGION_EXTRAS
EditorRegions::EditorRegions (Editor* e) EditorRegions::EditorRegions (Editor* e)
@ -177,8 +169,14 @@ EditorRegions::EditorRegions (Editor* e)
TreeViewColumn* col; TreeViewColumn* col;
Gtk::Label* l; Gtk::Label* l;
struct ColumnInfo {
int index;
int sort_idx;
Gtk::AlignmentEnum al;
const char* label;
const char* tooltip;
} ci[] = {
/* clang-format off */ /* clang-format off */
ColumnInfo ci[] = {
{ 0, 0, ALIGN_LEFT, _("Name"), _("Region name") }, { 0, 0, ALIGN_LEFT, _("Name"), _("Region name") },
{ 1, 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region") }, { 1, 1, ALIGN_LEFT, _("# Ch"), _("# Channels in the region") },
{ 2, 2, ALIGN_LEFT, _("Tags"), _("Tags") }, { 2, 2, ALIGN_LEFT, _("Tags"), _("Tags") },

15
gtk2_ardour/editor_route_groups.cc
View file

@ -62,12 +62,6 @@ using namespace PBD;
using namespace Gtk; using namespace Gtk;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
struct ColumnInfo {
int index;
const char* label;
const char* tooltip;
};
EditorRouteGroups::EditorRouteGroups (Editor* e) EditorRouteGroups::EditorRouteGroups (Editor* e)
: EditorComponent (e) : EditorComponent (e)
, _in_row_change (false) , _in_row_change (false)
@ -98,7 +92,12 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
TreeViewColumn* col; TreeViewColumn* col;
Gtk::Label* l; Gtk::Label* l;
ColumnInfo ci[] = { struct ColumnInfo {
int index;
const char* label;
const char* tooltip;
} ci[] = {
/* clang-format off */
{ 0, _("Col"), _("Group Tab Color") }, { 0, _("Col"), _("Group Tab Color") },
{ 1, _("Name"), _("Name of Group") }, { 1, _("Name"), _("Name of Group") },
{ 2, S_("Visible|V"), _("Group is visible?") }, { 2, S_("Visible|V"), _("Group is visible?") },
@ -113,7 +112,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
{ 11, S_("Active|A"), _("Sharing Active Status?") }, { 11, S_("Active|A"), _("Sharing Active Status?") },
{ -1, 0, 0 } { -1, 0, 0 }
}; };
/* clang-format on */
for (int i = 0; ci[i].index >= 0; ++i) { for (int i = 0; ci[i].index >= 0; ++i) {
col = _display.get_column (ci[i].index); col = _display.get_column (ci[i].index);