Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config value #3033

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open

Config value #3033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift click to select a range
5508819
Add tests for config
dvermd Jun 1, 2023
b3b9e0c
bar parameters use config::bar_ functions
dvermd May 30, 2023
8c178c0
settings parameters use config::setting_ functions
dvermd Jun 11, 2023
54e4e53
wip config::value
dvermd Jun 14, 2023
15c7b3f
replace some bar_get
dvermd Jun 14, 2023
25c67b7
replace the remaining bar_get
dvermd Jun 14, 2023
4f79a7d
config: improve [] accessor
dvermd Jun 21, 2023
9bfa9e4
config: add [] accessor test
dvermd Jun 21, 2023
4f293a8
improve code checks and add config::value::size function
dvermd Jun 28, 2023
8a91cac
Add test for load_label
dvermd Jul 5, 2023
e5b0ef6
fix config::value warning
dvermd Jul 5, 2023
7fa6807
remove config::value commented code
dvermd Jul 5, 2023
2919917
Add load_label(config::value)
dvermd Jul 5, 2023
79117f9
Add test for load_label(config::value)
dvermd Jul 5, 2023
9b6a2be
Use m_conf[] in fs
dvermd Jul 5, 2023
354dea7
Update formatter to use conf[] accessors
dvermd Jul 5, 2023
e04816b
fs use conf[] accessors
dvermd Jul 5, 2023
8567e34
fix config::value modules vs module access
dvermd Jul 8, 2023
07ac5f6
fix test of config::value modules vs module access
dvermd Jul 8, 2023
1459fdd
config.hpp: fix typo
dvermd Jul 8, 2023
8c3d54e
fs: use MODULE_ENTRY constant and factorize config::value creation
dvermd Jul 8, 2023
223b576
base: use MODULE_ENTRY constant and factorize config::value creation
dvermd Jul 8, 2023
b356c6a
test config: use MODULE_ENTRY constant and factorize config::value cr…
dvermd Jul 8, 2023
de58fda
add config::value::has()
dvermd Jul 8, 2023
da7d13b
restore usage of has in base.cpp for commit 'Update formatter to use …
dvermd Jul 8, 2023
80856c4
add test for config::value::has()
dvermd Jul 8, 2023
a79e6ac
add string_util::starts_with method
dvermd May 27, 2023
55a37cf
fix config::value::has
dvermd Jul 9, 2023
9c3a312
update config::value test after fix
dvermd Jul 9, 2023
69e83b5
refactor: use more conf[]
dvermd Jul 10, 2023
a21182b
factorize some conf[] access
dvermd Jul 14, 2023
c25659a
add load_ramp(config::value,...)
dvermd Jul 25, 2023
f52a003
add load_animation(config::value,...)
dvermd Jul 27, 2023
876b366
add load_progressbar(config::value,...)
dvermd Jul 27, 2023
d7405ac
call load_xyz functions with config::value arguments
dvermd Jul 5, 2023
cf0b229
remove load_animation(conf, section, name, ...)
dvermd Jul 27, 2023
b7f16ef
remove load_progressbar(bar_name, conf, section, name)
dvermd Jul 27, 2023
b794eac
remove load_ramp(conf, section, name)
dvermd Jul 27, 2023
b318555
remove load_label(conf, section, name, ...)
dvermd Oct 8, 2023
f1f5f39
remove config::value::size
dvermd Jul 27, 2023
e5aa1f7
add config::value::GLOBAL_WM_ENTRY
dvermd Jul 27, 2023
472180b
use more config::value
dvermd Jul 27, 2023
6266a3d
change get_with_prefix return to a map
dvermd Jul 28, 2023
faf0cca
use config::value::as_kv instead of config::get_with_prefix
dvermd Jul 28, 2023
1cb15c3
use config::value::as_kv instead of config::get_with_prefix
dvermd Jul 28, 2023
fb90a76
all calls to config are made through the config::value API
dvermd Jul 28, 2023
eb16896
update test for 'change get_with_prefix return to a map'
dvermd Oct 8, 2023
de099da
fix compilation after rebase
dvermd Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
call load_xyz functions with config::value arguments
  • Loading branch information
@dvermd
dvermd committed Nov 3, 2023
commit d7405ac0ab3929967412c577fd46316bb136683a
28 changes: 23 additions & 5 deletions include/modules/alsa.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 51,29 @@ namespace modules {
static constexpr auto FORMAT_VOLUME = "format-volume";
static constexpr auto FORMAT_MUTED = "format-muted";

static constexpr auto TAG_RAMP_VOLUME = "<ramp-volume>";
static constexpr auto TAG_RAMP_HEADPHONES = "<ramp-headphones>";
static constexpr auto TAG_BAR_VOLUME = "<bar-volume>";
static constexpr auto TAG_LABEL_VOLUME = "<label-volume>";
static constexpr auto TAG_LABEL_MUTED = "<label-muted>";
#define DEF_RAMP_VOLUME "ramp-volume"
#define DEF_RAMP_HEADPHONES "ramp-headphones"
#define DEF_BAR_VOLUME "bar-volume"
#define DEF_LABEL_VOLUME "label-volume"
#define DEF_LABEL_MUTED "label-muted"

static constexpr auto NAME_RAMP_VOLUME = DEF_RAMP_VOLUME;
static constexpr auto NAME_RAMP_HEADPHONES = DEF_RAMP_HEADPHONES;
static constexpr auto NAME_BAR_VOLUME = DEF_BAR_VOLUME;
static constexpr auto NAME_LABEL_VOLUME = DEF_LABEL_VOLUME;
static constexpr auto NAME_LABEL_MUTED = DEF_LABEL_MUTED;

static constexpr auto TAG_RAMP_VOLUME = "<" DEF_RAMP_VOLUME ">";
static constexpr auto TAG_RAMP_HEADPHONES = "<" DEF_RAMP_HEADPHONES ">";
static constexpr auto TAG_BAR_VOLUME = "<" DEF_BAR_VOLUME ">";
static constexpr auto TAG_LABEL_VOLUME = "<" DEF_LABEL_VOLUME ">";
static constexpr auto TAG_LABEL_MUTED = "<" DEF_LABEL_MUTED ">";

#undef DEF_RAMP_VOLUME
#undef DEF_RAMP_HEADPHONES
#undef DEF_BAR_VOLUME
#undef DEF_LABEL_VOLUME
#undef DEF_LABEL_MUTED

progressbar_t m_bar_volume;
ramp_t m_ramp_volume;
Expand Down
16 changes: 13 additions & 3 deletions include/modules/backlight.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 51,19 @@ namespace modules {
void change_value(int value_mod);

private:
static constexpr auto TAG_LABEL = "<label>";
static constexpr auto TAG_BAR = "<bar>";
static constexpr auto TAG_RAMP = "<ramp>";
#define DEF_LABEL "label"
#define DEF_BAR "bar"
#define DEF_RAMP "ramp"
static constexpr auto NAME_LABEL = DEF_LABEL;
static constexpr auto NAME_BAR = DEF_BAR;
static constexpr auto NAME_RAMP = DEF_RAMP;

static constexpr auto TAG_LABEL = "<" DEF_LABEL ">";
static constexpr auto TAG_BAR = "<" DEF_BAR ">";
static constexpr auto TAG_RAMP = "<" DEF_RAMP ">";
#undef DEF_LABEL
#undef DEF_BAR
#undef DEF_RAMP

ramp_t m_ramp;
label_t m_label;
Expand Down
48 changes: 39 additions & 9 deletions include/modules/battery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 72,45 @@ namespace modules {
static constexpr const char* FORMAT_FULL{"format-full"};
static constexpr const char* FORMAT_LOW{"format-low"};

static constexpr const char* TAG_ANIMATION_CHARGING{"<animation-charging>"};
static constexpr const char* TAG_ANIMATION_DISCHARGING{"<animation-discharging>"};
static constexpr const char* TAG_ANIMATION_LOW{"<animation-low>"};
static constexpr const char* TAG_BAR_CAPACITY{"<bar-capacity>"};
static constexpr const char* TAG_RAMP_CAPACITY{"<ramp-capacity>"};
static constexpr const char* TAG_LABEL_CHARGING{"<label-charging>"};
static constexpr const char* TAG_LABEL_DISCHARGING{"<label-discharging>"};
static constexpr const char* TAG_LABEL_FULL{"<label-full>"};
static constexpr const char* TAG_LABEL_LOW{"<label-low>"};
#define DEF_ANIMATION_CHARGING "animation-charging"
#define DEF_ANIMATION_DISCHARGING "animation-discharging"
#define DEF_ANIMATION_LOW "animation-low"
#define DEF_BAR_CAPACITY "bar-capacity"
#define DEF_RAMP_CAPACITY "ramp-capacity"
#define DEF_LABEL_CHARGING "label-charging"
#define DEF_LABEL_DISCHARGING "label-discharging"
#define DEF_LABEL_FULL "label-full"
#define DEF_LABEL_LOW "label-low"

static constexpr const char* NAME_ANIMATION_CHARGING{DEF_ANIMATION_CHARGING};
static constexpr const char* NAME_ANIMATION_DISCHARGING{DEF_ANIMATION_DISCHARGING};
static constexpr const char* NAME_ANIMATION_LOW{DEF_ANIMATION_LOW};
static constexpr const char* NAME_BAR_CAPACITY{DEF_BAR_CAPACITY};
static constexpr const char* NAME_RAMP_CAPACITY{DEF_RAMP_CAPACITY};
static constexpr const char* NAME_LABEL_CHARGING{DEF_LABEL_CHARGING};
static constexpr const char* NAME_LABEL_DISCHARGING{DEF_LABEL_DISCHARGING};
static constexpr const char* NAME_LABEL_FULL{DEF_LABEL_FULL};
static constexpr const char* NAME_LABEL_LOW{DEF_LABEL_LOW};

static constexpr const char* TAG_ANIMATION_CHARGING{"<" DEF_ANIMATION_CHARGING ">"};
static constexpr const char* TAG_ANIMATION_DISCHARGING{"<" DEF_ANIMATION_DISCHARGING ">"};
static constexpr const char* TAG_ANIMATION_LOW{"<" DEF_ANIMATION_LOW ">"};
static constexpr const char* TAG_BAR_CAPACITY{"<" DEF_BAR_CAPACITY ">"};
static constexpr const char* TAG_RAMP_CAPACITY{"<" DEF_RAMP_CAPACITY ">"};
static constexpr const char* TAG_LABEL_CHARGING{"<" DEF_LABEL_CHARGING ">"};
static constexpr const char* TAG_LABEL_DISCHARGING{"<" DEF_LABEL_DISCHARGING ">"};
static constexpr const char* TAG_LABEL_FULL{"<" DEF_LABEL_FULL ">"};
static constexpr const char* TAG_LABEL_LOW{"<" DEF_LABEL_LOW ">"};

#undef DEF_ANIMATION_CHARGING
#undef DEF_ANIMATION_DISCHARGING
#undef DEF_ANIMATION_LOW
#undef DEF_BAR_CAPACITY
#undef DEF_RAMP_CAPACITY
#undef DEF_LABEL_CHARGING
#undef DEF_LABEL_DISCHARGING
#undef DEF_LABEL_FULL
#undef DEF_LABEL_LOW

static const size_t SKIP_N_UNCHANGED{3_z};

Expand Down
29 changes: 24 additions & 5 deletions include/modules/cpu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 34,30 @@ namespace modules {
float get_load(size_t core) const;

private:
static constexpr auto TAG_LABEL = "<label>";
static constexpr auto TAG_LABEL_WARN = "<label-warn>";
static constexpr auto TAG_BAR_LOAD = "<bar-load>";
static constexpr auto TAG_RAMP_LOAD = "<ramp-load>";
static constexpr auto TAG_RAMP_LOAD_PER_CORE = "<ramp-coreload>";
#define DEF_LABEL "label"
#define DEF_LABEL_WARN "label-warn"
#define DEF_BAR_LOAD "bar-load"
#define DEF_RAMP_LOAD "ramp-load"
#define DEF_RAMP_LOAD_PER_CORE "ramp-coreload"

static constexpr auto NAME_LABEL = DEF_LABEL;
static constexpr auto NAME_LABEL_WARN = DEF_LABEL_WARN;
static constexpr auto NAME_BAR_LOAD = DEF_BAR_LOAD;
static constexpr auto NAME_RAMP_LOAD = DEF_RAMP_LOAD;
static constexpr auto NAME_RAMP_LOAD_PER_CORE = DEF_RAMP_LOAD_PER_CORE;

static constexpr auto TAG_LABEL = "<" DEF_LABEL ">";
static constexpr auto TAG_LABEL_WARN = "<" DEF_LABEL_WARN ">";
static constexpr auto TAG_BAR_LOAD = "<" DEF_BAR_LOAD ">";
static constexpr auto TAG_RAMP_LOAD = "<" DEF_RAMP_LOAD ">";
static constexpr auto TAG_RAMP_LOAD_PER_CORE = "<" DEF_RAMP_LOAD_PER_CORE ">";

#undef DEF_LABEL
#undef DEF_LABEL_WARN
#undef DEF_BAR_LOAD
#undef DEF_RAMP_LOAD
#undef DEF_RAMP_LOAD_PER_CORE

static constexpr auto FORMAT_WARN = "format-warn";

label_t m_label;
Expand Down
38 changes: 29 additions & 9 deletions include/modules/fs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 49,35 @@ namespace modules {
static constexpr auto FORMAT_MOUNTED = "format-mounted";
static constexpr auto FORMAT_WARN = "format-warn";
static constexpr auto FORMAT_UNMOUNTED = "format-unmounted";
static constexpr auto LABEL_MOUNTED = "label-mounted";
static constexpr auto TAG_LABEL_MOUNTED = "<label-mounted>";
static constexpr auto LABEL_UNMOUNTED = "label-unmounted";
static constexpr auto TAG_LABEL_UNMOUNTED = "<label-unmounted>";
static constexpr auto LABEL_WARN = "label-warn";
static constexpr auto TAG_LABEL_WARN = "<label-warn>";
static constexpr auto TAG_BAR_USED = "<bar-used>";
static constexpr auto TAG_BAR_FREE = "<bar-free>";
static constexpr auto TAG_RAMP_CAPACITY = "<ramp-capacity>";

#define DEF_LABEL_MOUNTED "label-mounted"
#define DEF_LABEL_UNMOUNTED "label-unmounted"
#define DEF_LABEL_WARN "label-warn"
#define DEF_BAR_USED "bar-used"
#define DEF_BAR_FREE "bar-free"
#define DEF_RAMP_CAPACITY "ramp-capacity"

static constexpr auto NAME_LABEL_MOUNTED = DEF_LABEL_MOUNTED;
static constexpr auto NAME_LABEL_UNMOUNTED = DEF_LABEL_UNMOUNTED;
static constexpr auto NAME_LABEL_WARN = DEF_LABEL_WARN;
static constexpr auto NAME_BAR_USED = DEF_BAR_USED;
static constexpr auto NAME_BAR_FREE = DEF_BAR_FREE;
static constexpr auto NAME_RAMP_CAPACITY = DEF_RAMP_CAPACITY;

static constexpr auto TAG_LABEL_MOUNTED = "<" DEF_LABEL_MOUNTED ">";
static constexpr auto TAG_LABEL_UNMOUNTED = "<" DEF_LABEL_UNMOUNTED ">";
static constexpr auto TAG_LABEL_WARN = "<" DEF_LABEL_WARN ">";
static constexpr auto TAG_BAR_USED = "<" DEF_BAR_USED ">";
static constexpr auto TAG_BAR_FREE = "<" DEF_BAR_FREE ">";
static constexpr auto TAG_RAMP_CAPACITY = "<" DEF_RAMP_CAPACITY ">";

#undef DEF_LABEL_MOUNTED
#undef DEF_LABEL_UNMOUNTED
#undef DEF_LABEL_WARN
#undef DEF_BAR_USED
#undef DEF_BAR_FREE
#undef DEF_RAMP_CAPACITY


label_t m_labelmounted;
label_t m_labelunmounted;
Expand Down
14 changes: 12 additions & 2 deletions include/modules/github.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 27,18 @@ namespace modules {
void update_label(int);
int get_number_of_notification();
string request();
static constexpr auto TAG_LABEL = "<label>";
static constexpr auto TAG_LABEL_OFFLINE = "<label-offline>";

#define DEF_LABEL "label"
#define DEF_LABEL_OFFLINE "label-offline"

static constexpr auto NAME_LABEL = DEF_LABEL;
static constexpr auto NAME_LABEL_OFFLINE = DEF_LABEL_OFFLINE;
static constexpr auto TAG_LABEL = "<" DEF_LABEL ">";
static constexpr auto TAG_LABEL_OFFLINE = "<" DEF_LABEL_OFFLINE ">";

#undef DEF_LABEL
#undef DEF_LABEL_OFFLINE

static constexpr auto FORMAT_OFFLINE = "format-offline";

label_t m_label{};
Expand Down
5 changes: 4 additions & 1 deletion include/modules/ipc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 58,10 @@ namespace modules {
void update_output() ;
private:
static constexpr auto TAG_OUTPUT = "<output>";
static constexpr auto TAG_LABEL = "<label>";
#define DEF_LABEL "label"
static constexpr auto NAME_LABEL = DEF_LABEL;
static constexpr auto TAG_LABEL = "<" DEF_LABEL ">";
#undef DEF_LABEL

label_t m_label;

Expand Down
53 changes: 43 additions & 10 deletions include/modules/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 20,49 @@ namespace modules {
static constexpr auto TYPE = MEMORY_TYPE;

private:
static constexpr const char* TAG_LABEL{"<label>"};
static constexpr const char* TAG_LABEL_WARN{"<label-warn>"};
static constexpr const char* TAG_BAR_USED{"<bar-used>"};
static constexpr const char* TAG_BAR_FREE{"<bar-free>"};
static constexpr const char* TAG_RAMP_USED{"<ramp-used>"};
static constexpr const char* TAG_RAMP_FREE{"<ramp-free>"};
static constexpr const char* TAG_BAR_SWAP_USED{"<bar-swap-used>"};
static constexpr const char* TAG_BAR_SWAP_FREE{"<bar-swap-free>"};
static constexpr const char* TAG_RAMP_SWAP_USED{"<ramp-swap-used>"};
static constexpr const char* TAG_RAMP_SWAP_FREE{"<ramp-swap-free>"};
#define DEF_LABEL "label"
#define DEF_LABEL_WARN "label-warn"
#define DEF_BAR_USED "bar-used"
#define DEF_BAR_FREE "bar-free"
#define DEF_RAMP_USED "ramp-used"
#define DEF_RAMP_FREE "ramp-free"
#define DEF_BAR_SWAP_USED "bar-swap-used"
#define DEF_BAR_SWAP_FREE "bar-swap-free"
#define DEF_RAMP_SWAP_USED "ramp-swap-used"
#define DEF_RAMP_SWAP_FREE "ramp-swap-free"

static constexpr const char* NAME_LABEL{DEF_LABEL};
static constexpr const char* NAME_LABEL_WARN{DEF_LABEL_WARN};
static constexpr const char* NAME_BAR_USED{DEF_BAR_USED};
static constexpr const char* NAME_BAR_FREE{DEF_BAR_FREE};
static constexpr const char* NAME_RAMP_USED{DEF_RAMP_USED};
static constexpr const char* NAME_RAMP_FREE{DEF_RAMP_FREE};
static constexpr const char* NAME_BAR_SWAP_USED{DEF_BAR_SWAP_USED};
static constexpr const char* NAME_BAR_SWAP_FREE{DEF_BAR_SWAP_FREE};
static constexpr const char* NAME_RAMP_SWAP_USED{DEF_RAMP_SWAP_USED};
static constexpr const char* NAME_RAMP_SWAP_FREE{DEF_RAMP_SWAP_FREE};

static constexpr const char* TAG_LABEL{"<" DEF_LABEL ">"};
static constexpr const char* TAG_LABEL_WARN{"<" DEF_LABEL_WARN ">"};
static constexpr const char* TAG_BAR_USED{"<" DEF_BAR_USED ">"};
static constexpr const char* TAG_BAR_FREE{"<" DEF_BAR_FREE ">"};
static constexpr const char* TAG_RAMP_USED{"<" DEF_RAMP_USED ">"};
static constexpr const char* TAG_RAMP_FREE{"<" DEF_RAMP_FREE ">"};
static constexpr const char* TAG_BAR_SWAP_USED{"<" DEF_BAR_SWAP_USED ">"};
static constexpr const char* TAG_BAR_SWAP_FREE{"<" DEF_BAR_SWAP_FREE ">"};
static constexpr const char* TAG_RAMP_SWAP_USED{"<" DEF_RAMP_SWAP_USED ">"};
static constexpr const char* TAG_RAMP_SWAP_FREE{"<" DEF_RAMP_SWAP_FREE ">"};
#undef DEF_LABEL
#undef DEF_LABEL_WARN
#undef DEF_BAR_USED
#undef DEF_BAR_FREE
#undef DEF_RAMP_USED
#undef DEF_RAMP_FREE
#undef DEF_BAR_SWAP_USED
#undef DEF_BAR_SWAP_FREE
#undef DEF_RAMP_SWAP_USED
#undef DEF_RAMP_SWAP_FREE

static constexpr const char* FORMAT_WARN{"format-warn"};

label_t m_label;
Expand Down
65 changes: 49 additions & 16 deletions include/modules/mpd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,38 51,71 @@ namespace modules {
void action_seek(const string& data);

private:
#define DEF_BAR_PROGRESS "bar-progress"
#define DEF_LABEL_SONG "label-song"
#define DEF_LABEL_TIME "label-time"
#define DEF_ICON_RANDOM "icon-random"
#define DEF_ICON_REPEAT "icon-repeat"
#define DEF_ICON_SINGLE "icon-single"
#define DEF_ICON_CONSUME "icon-consume"
#define DEF_ICON_PREV "icon-prev"
#define DEF_ICON_STOP "icon-stop"
#define DEF_ICON_PLAY "icon-play"
#define DEF_ICON_PAUSE "icon-pause"
#define DEF_ICON_NEXT "icon-next"
#define DEF_ICON_SEEKB "icon-seekb"
#define DEF_ICON_SEEKF "icon-seekf"
#define DEF_LABEL_OFFLINE "label-offline"
#define DEF_ICON_REPEAT_ONE "icon-repeatone"

static constexpr const char* FORMAT_ONLINE{"format-online"};
static constexpr const char* FORMAT_PLAYING{"format-playing"};
static constexpr const char* FORMAT_PAUSED{"format-paused"};
static constexpr const char* FORMAT_STOPPED{"format-stopped"};
static constexpr const char* TAG_BAR_PROGRESS{"<bar-progress>"};
static constexpr const char* NAME_BAR_PROGRESS{DEF_BAR_PROGRESS};
static constexpr const char* TAG_BAR_PROGRESS{"<" DEF_BAR_PROGRESS ">"};
static constexpr const char* TAG_TOGGLE{"<toggle>"};
static constexpr const char* TAG_TOGGLE_STOP{"<toggle-stop>"};
static constexpr const char* TAG_LABEL_SONG{"<label-song>"};
static constexpr const char* TAG_LABEL_TIME{"<label-time>"};
static constexpr const char* TAG_ICON_RANDOM{"<icon-random>"};
static constexpr const char* TAG_ICON_REPEAT{"<icon-repeat>"};
static constexpr const char* NAME_LABEL_SONG{DEF_LABEL_SONG};
static constexpr const char* TAG_LABEL_SONG{"<" DEF_LABEL_SONG ">"};
static constexpr const char* NAME_LABEL_TIME{DEF_LABEL_TIME};
static constexpr const char* TAG_LABEL_TIME{"<" DEF_LABEL_TIME ">"};
static constexpr const char* NAME_ICON_RANDOM{DEF_ICON_RANDOM};
static constexpr const char* TAG_ICON_RANDOM{"<" DEF_ICON_RANDOM ">"};
static constexpr const char* NAME_ICON_REPEAT{DEF_ICON_REPEAT};
static constexpr const char* TAG_ICON_REPEAT{"<" DEF_ICON_REPEAT ">"};
/*
* Deprecated
*/
static constexpr const char* TAG_ICON_REPEAT_ONE{"<icon-repeatone>"};
static constexpr const char* NAME_ICON_REPEAT_ONE{DEF_ICON_REPEAT_ONE};
static constexpr const char* TAG_ICON_REPEAT_ONE{"<" DEF_ICON_REPEAT_ONE ">"};
/*
* Replaces icon-repeatone
*
* repeatone is misleading, since it doesn't actually affect the repeating behaviour
*/
static constexpr const char* TAG_ICON_SINGLE{"<icon-single>"};
static constexpr const char* TAG_ICON_CONSUME{"<icon-consume>"};
static constexpr const char* TAG_ICON_PREV{"<icon-prev>"};
static constexpr const char* TAG_ICON_STOP{"<icon-stop>"};
static constexpr const char* TAG_ICON_PLAY{"<icon-play>"};
static constexpr const char* TAG_ICON_PAUSE{"<icon-pause>"};
static constexpr const char* TAG_ICON_NEXT{"<icon-next>"};
static constexpr const char* TAG_ICON_SEEKB{"<icon-seekb>"};
static constexpr const char* TAG_ICON_SEEKF{"<icon-seekf>"};
static constexpr const char* NAME_ICON_SINGLE{DEF_ICON_SINGLE};
static constexpr const char* TAG_ICON_SINGLE{"<" DEF_ICON_SINGLE ">"};
static constexpr const char* NAME_ICON_CONSUME{DEF_ICON_CONSUME};
static constexpr const char* TAG_ICON_CONSUME{"<" DEF_ICON_CONSUME ">"};
static constexpr const char* NAME_ICON_PREV{DEF_ICON_PREV};
static constexpr const char* TAG_ICON_PREV{"<" DEF_ICON_PREV ">"};
static constexpr const char* NAME_ICON_STOP{DEF_ICON_STOP};
static constexpr const char* TAG_ICON_STOP{"<" DEF_ICON_STOP ">"};
static constexpr const char* NAME_ICON_PLAY{DEF_ICON_PLAY};
static constexpr const char* TAG_ICON_PLAY{"<" DEF_ICON_PLAY ">"};
static constexpr const char* NAME_ICON_PAUSE{DEF_ICON_PAUSE};
static constexpr const char* TAG_ICON_PAUSE{"<" DEF_ICON_PAUSE ">"};
static constexpr const char* NAME_ICON_NEXT{DEF_ICON_NEXT};
static constexpr const char* TAG_ICON_NEXT{"<" DEF_ICON_NEXT ">"};
static constexpr const char* NAME_ICON_SEEKB{DEF_ICON_SEEKB};
static constexpr const char* TAG_ICON_SEEKB{"<" DEF_ICON_SEEKB ">"};
static constexpr const char* NAME_ICON_SEEKF{DEF_ICON_SEEKF};
static constexpr const char* TAG_ICON_SEEKF{"<" DEF_ICON_SEEKF ">"};

static constexpr const char* FORMAT_OFFLINE{"format-offline"};
static constexpr const char* TAG_LABEL_OFFLINE{"<label-offline>"};
static constexpr const char* NAME_LABEL_OFFLINE{DEF_LABEL_OFFLINE};
static constexpr const char* TAG_LABEL_OFFLINE{"<" DEF_LABEL_OFFLINE ">"};

unique_ptr<mpdconnection> m_mpd;

Expand Down
Loading