aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-01-01 21:12:37 -0500
committerDave Reisner <dreisner@archlinux.org>2013-01-01 21:12:37 -0500
commit07347623642f6f841580fac139dba2b3b6d97b35 (patch)
tree41f3f8256a601c13edf115ce97fdebcd58bc6948
parent544047c06ffc7be6fa7f22f895eaab691038ee22 (diff)
downloadmirror-ponymix-07347623642f6f841580fac139dba2b3b6d97b35.tar.gz
mirror-ponymix-07347623642f6f841580fac139dba2b3b6d97b35.tar.bz2
mirror-ponymix-07347623642f6f841580fac139dba2b3b6d97b35.zip
oops
-rw-r--r--pulse.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/pulse.cc b/pulse.cc
index 1ac1867..77a1568 100644
--- a/pulse.cc
+++ b/pulse.cc
@@ -493,7 +493,7 @@ Card::Card(const pa_card_info* info) :
Device::Device(const pa_sink_info* info) :
type_(DEVTYPE_SINK),
index_(info->index),
- name_(!info->name.empty() ? info->name : ""),
+ name_(info->name ? info->name : ""),
desc_(info->description),
mute_(info->mute) {
update_volume(info->volume);
@@ -508,7 +508,7 @@ Device::Device(const pa_sink_info* info) :
Device::Device(const pa_source_info* info) :
type_(DEVTYPE_SOURCE),
index_(info->index),
- name_(!info->name.empty() ? info->name : ""),
+ name_(info->name ? info->name : ""),
desc_(info->description),
mute_(info->mute) {
update_volume(info->volume);
@@ -523,7 +523,7 @@ Device::Device(const pa_source_info* info) :
Device::Device(const pa_sink_input_info* info) :
type_(DEVTYPE_SINK_INPUT),
index_(info->index),
- name_(!info->name.empty() ? info->name : ""),
+ name_(info->name ? info->name : ""),
mute_(info->mute) {
update_volume(info->volume);
memcpy(&channels_, &info->channel_map, sizeof(pa_channel_map));
@@ -542,7 +542,7 @@ Device::Device(const pa_sink_input_info* info) :
Device::Device(const pa_source_output_info* info) :
type_(DEVTYPE_SOURCE_OUTPUT),
index_(info->index),
- name_(!info->name.empty() ? info->name : ""),
+ name_(info->name ? info->name : ""),
mute_(info->mute) {
update_volume(info->volume);
volume_percent_ = volume_as_percent(&volume_);