From 59f8144c50765189594d5932fc25869f9ea6e265 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 19 Oct 2013 18:19:03 +0200 Subject: *: use nullptr instead of NULL --- src/Volume.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Volume.cxx') 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)) -- cgit v1.2.3