Fix issue #45

cdemoulins · Jan 14, 2022 · 4636885 · 4636885
1 parent 53c296c
commit 4636885
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/device.cc b/device.cc
@@ -27,6 +27,12 @@ Device::Device(const pa_source_info* info) {
     name            = info->name;
     description     = info->description;
     mute            = info->mute == 1;
+    switch(info->state) {
+        case PA_SOURCE_RUNNING: state = DEVICE_RUNNING; break;
+        case PA_SOURCE_IDLE: state = DEVICE_IDLE; break;
+        case PA_SOURCE_SUSPENDED: state = DEVICE_SUSPENDED; break;
+        default: state = DEVICE_INVALID_STATE;
+    }
     setVolume(&(info->volume));
 }
 
@@ -37,6 +43,12 @@ Device::Device(const pa_sink_info* info) {
     name            = info->name;
     description     = info->description;
     mute            = info->mute == 1;
+    switch(info->state) {
+        case PA_SINK_RUNNING: state = DEVICE_RUNNING; break;
+        case PA_SINK_IDLE: state = DEVICE_IDLE; break;
+        case PA_SINK_SUSPENDED: state = DEVICE_SUSPENDED; break;
+        default: state = DEVICE_INVALID_STATE;
+    }
     setVolume(&(info->volume));
 }
 

diff --git a/device.hh b/device.hh
@@ -29,6 +29,13 @@ enum device_type {
 };
 typedef enum device_type device_type_t;
 
+enum device_state {
+    DEVICE_INVALID_STATE,
+    DEVICE_RUNNING,
+    DEVICE_IDLE,
+    DEVICE_SUSPENDED
+};
+typedef enum device_state device_state_t;
 
 /**
  * Class to store device (sink or source) related informations
@@ -42,6 +49,7 @@ public:
     device_type_t type;
     std::string name;
     std::string description;
+    device_state_t state;
     pa_cvolume volume;
     pa_volume_t volume_avg;
     int volume_percent;

diff --git a/pamixer.cc b/pamixer.cc
@@ -61,6 +61,17 @@ Device get_selected_device(Pulseaudio& pulse, po::variables_map vm, string sink_
     return device;
 }
 
+string device_state_to_string(Device device) {
+    string state;
+    switch(device.state) {
+        case DEVICE_RUNNING: state = string("Running"); break;
+        case DEVICE_IDLE: state = string("Idle"); break;
+        case DEVICE_SUSPENDED: state = string("Suspended"); break;
+        default: state = string("Invalid state");
+    }
+    return state;
+}
+
 pa_volume_t gammaCorrection(pa_volume_t i, double gamma, int delta) {
     double j = double(i);
     double relRelta = double(delta) / 100.0;
@@ -210,6 +221,7 @@ int main(int argc, char* argv[])
                 for (const Device& sink : pulse.get_sinks()) {
                     cout << sink.index << " \""
                          << sink.name << "\" \""
+                         << device_state_to_string(sink) << "\" \""
                          << sink.description << "\"\n";
                 }
             }
@@ -218,6 +230,7 @@ int main(int argc, char* argv[])
                 for (const Device& source : pulse.get_sources()) {
                     cout << source.index << " \""
                          << source.name << "\" \""
+                         << device_state_to_string(source) << "\" \""
                          << source.description << "\"\n";
                 }
             }