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

Use XMLNode::get/set_property API in EditorRegions class

Browse source
This commit is contained in:
Tim Mayberry 2016-08-29 09:27:25 +10:00
parent 346123e619
commit df33a6e53a
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gtk2_ardour/editor_regions.cc
View file

@ -40,6 +40,7 @@
#include "audio_clock.h" #include "audio_clock.h"
#include "editor.h" #include "editor.h"
#include "editing.h" #include "editing.h"
#include "editing_convert.h"
#include "keyboard.h" #include "keyboard.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "gui_thread.h" #include "gui_thread.h"
@ -1529,13 +1530,13 @@ EditorRegions::get_state () const
{ {
XMLNode* node = new XMLNode (X_("RegionList")); XMLNode* node = new XMLNode (X_("RegionList"));
node->add_property (X_("sort-type"), enum_2_string (_sort_type)); node->set_property (X_("sort-type"), _sort_type);
RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("SortAscending")); RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("SortAscending"));
bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active (); bool const ascending = RefPtr<RadioAction>::cast_dynamic(act)->get_active ();
node->add_property (X_("sort-ascending"), ascending ? "yes" : "no"); node->set_property (X_("sort-ascending"), ascending);
node->add_property (X_("show-all"), toggle_full_action()->get_active() ? "yes" : "no"); node->set_property (X_("show-all"), toggle_full_action()->get_active());
node->add_property (X_("show-automatic-regions"), _show_automatic_regions ? "yes" : "no"); node->set_property (X_("show-automatic-regions"), _show_automatic_regions);
return *node; return *node;
} }
@ -1549,10 +1550,8 @@ EditorRegions::set_state (const XMLNode & node)
return; return;
} }
XMLProperty const * p = node.property (X_("sort-type")); Editing::RegionListSortType t;
if (node.get_property (X_("sort-type"), t)) {
if (p) {
Editing::RegionListSortType const t = static_cast<Editing::RegionListSortType> (string_2_enum (p->value(), _sort_type));
if (_sort_type != t) { if (_sort_type != t) {
changed = true; changed = true;
@ -1563,10 +1562,8 @@ EditorRegions::set_state (const XMLNode & node)
ract->set_active (); ract->set_active ();
} }
p = node.property (X_("sort-ascending")); bool yn;
if (node.get_property (X_("sort-ascending"), yn)) {
if (p) {
bool const yn = string_is_affirmative (p->value ());
SortType old_sort_type; SortType old_sort_type;
int old_sort_column; int old_sort_column;
@ -1588,10 +1585,7 @@ EditorRegions::set_state (const XMLNode & node)
RefPtr<RadioAction>::cast_dynamic(act)->set_active (); RefPtr<RadioAction>::cast_dynamic(act)->set_active ();
} }
p = node.property (X_("show-all")); if (node.get_property (X_("show-all"), yn)) {
if (p) {
bool const yn = string_is_affirmative (p->value ());
if (expanded != yn) { if (expanded != yn) {
changed = true; changed = true;
} }
@ -1600,10 +1594,7 @@ EditorRegions::set_state (const XMLNode & node)
toggle_full_action()->set_active (yn); toggle_full_action()->set_active (yn);
} }
p = node.property (X_("show-automatic-regions")); if (node.get_property (X_("show-automatic-regions"), yn)) {
if (p) {
bool const yn = string_is_affirmative (p->value ());
if (yn != _show_automatic_regions) { if (yn != _show_automatic_regions) {
_show_automatic_regions = yn; _show_automatic_regions = yn;
toggle_show_auto_regions_action()->set_active (yn); toggle_show_auto_regions_action()->set_active (yn);