aboutsummaryrefslogtreecommitdiffstats
path: root/src/Volume.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
committerMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
commit59f8144c50765189594d5932fc25869f9ea6e265 (patch)
treef460d9f46a99040dea402bcb3ad2d84a0e734285 /src/Volume.cxx
parent5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff)
downloadmpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip
*: use nullptr instead of NULL
Diffstat (limited to 'src/Volume.cxx')
-rw-r--r--src/Volume.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Volume.cxx b/src/Volume.cxx
index b23b9688f..6c5f8dc4d 100644
--- a/src/Volume.cxx
+++ b/src/Volume.cxx
@@ -68,10 +68,10 @@ void volume_init(void)
int volume_level_get(void)
{
- assert(hardware_volume_timer != NULL);
+ assert(hardware_volume_timer != nullptr);
if (last_hardware_volume >= 0 &&
- g_timer_elapsed(hardware_volume_timer, NULL) < 1.0)
+ g_timer_elapsed(hardware_volume_timer, nullptr) < 1.0)
/* throttle access to hardware mixers */
return last_hardware_volume;
@@ -112,7 +112,7 @@ bool volume_level_change(unsigned volume)
bool
read_sw_volume_state(const char *line)
{
- char *end = NULL;
+ char *end = nullptr;
long int sv;
if (!g_str_has_prefix(line, SW_VOLUME_STATE))