itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deal with non-initialized data from m-s-r

This commit is contained in:
Lennart Poettering 2009-02-04 18:40:12 +01:00
parent 1ad5143d15
commit 01e4826b65
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pavucontrol.cc
View File

@ -932,7 +932,7 @@ void RoleWidget::executeVolumeUpdate() {
info.channel_map.channels = 1; info.channel_map.channels = 1;
info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
info.volume = volume; info.volume = volume;
info.device = device.c_str(); info.device = device == "" ? NULL : device.c_str();
info.mute = muteToggleButton->get_active(); info.mute = muteToggleButton->get_active();
pa_operation* o; pa_operation* o;
@ -944,7 +944,6 @@ void RoleWidget::executeVolumeUpdate() {
pa_operation_unref(o); pa_operation_unref(o);
} }
/*** MainWindow ***/ /*** MainWindow ***/
MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
@ -1420,10 +1419,10 @@ void MainWindow::updateRole(const pa_ext_stream_restore_info &info) {
eventRoleWidget->updating = true; eventRoleWidget->updating = true;
eventRoleWidget->device = info.device; eventRoleWidget->device = info.device ? info.device : "";
volume.channels = 1; volume.channels = 1;
volume.values[0] = pa_cvolume_avg(&info.volume); volume.values[0] = pa_cvolume_max(&info.volume);
eventRoleWidget->setVolume(volume); eventRoleWidget->setVolume(volume);
eventRoleWidget->muteToggleButton->set_active(info.mute); eventRoleWidget->muteToggleButton->set_active(info.mute);