From e1fcfdf85ee0e2aeb2adf9cfa68829a0e349c5e3 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Mon, 23 Jul 2018 21:24:19 +0200 Subject: [PATCH] Last fix pulseaudio volume restore --- include/f1x/openauto/autoapp/UI/MainWindow.hpp | 1 - src/autoapp/UI/MainWindow.cpp | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index 679750a..803ff9a 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -75,7 +75,6 @@ private slots: void toggleExit(); void showRearCamBG(); void hideRearCamBG(); - void saveVolumeOnExit(); private: Ui::MainWindow* ui_; diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 10e7d98..622ea78 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -108,9 +108,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::cameraStop); connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::cameraHide); connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::cameraControlHide); - connect(ui_->pushButtonShutdown, &QPushButton::clicked, this, &MainWindow::saveVolumeOnExit); connect(ui_->pushButtonShutdown, &QPushButton::clicked, this, &MainWindow::exit); - connect(ui_->pushButtonReboot, &QPushButton::clicked, this, &MainWindow::saveVolumeOnExit); connect(ui_->pushButtonReboot, &QPushButton::clicked, this, &MainWindow::reboot); connect(ui_->pushButtonCancel, &QPushButton::clicked, this, &MainWindow::toggleExit); connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); @@ -260,6 +258,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi } } } + system("/usr/local/bin/autoapp_helper restorevolumes"); } MainWindow::~MainWindow() @@ -431,12 +430,6 @@ void f1x::openauto::autoapp::ui::MainWindow::hideRearCamBG() ui_->pushButtonRearcamBack->hide(); } -void f1x::openauto::autoapp::ui::MainWindow::saveVolumeOnExit() -{ - system("/usr/local/bin/autoapp_helper savevolumes"); - //system("/usr/local/bin/autoapp_helper savecapvolume"); -} - void f1x::openauto::autoapp::ui::MainWindow::showTime() {