Merge branch 'v1.19' of git://repo.or.cz/openal-soft into v1.19v1.19

1 files changed, 32 insertions, 0 deletions

diff --git a/utils/alsoft-config/mainwindow.h b/utils/alsoft-config/mainwindow.h
index b5a1ae7c..8b763845 100644
--- a/utils/alsoft-config/mainwindow.h
+++ b/utils/alsoft-config/mainwindow.h
@@ -17,16 +17,32 @@ public:
     ~MainWindow();
 
 private slots:
+    void cancelCloseAction();
+
     void saveCurrentConfig();
 
     void saveConfigAsFile();
     void loadConfigFromFile();
 
+    void showAboutPage();
+
+    void enableApplyButton();
+
+    void updateResamplerLabel(int num);
+
     void updatePeriodSizeEdit(int size);
     void updatePeriodSizeSlider();
     void updatePeriodCountEdit(int size);
     void updatePeriodCountSlider();
 
+    void selectQuadDecoderFile();
+    void select51DecoderFile();
+    void select61DecoderFile();
+    void select71DecoderFile();
+
+    void updateJackBufferSizeEdit(int size);
+    void updateJackBufferSizeSlider();
+
     void addHrtfFile();
     void removeHrtfFile();
 
@@ -35,6 +51,13 @@ private slots:
     void showEnabledBackendMenu(QPoint pt);
     void showDisabledBackendMenu(QPoint pt);
 
+    void selectOSSPlayback();
+    void selectOSSCapture();
+
+    void selectSolarisPlayback();
+
+    void selectWaveOutput();
+
 private:
     Ui::MainWindow *ui;
 
@@ -44,6 +67,15 @@ private:
     QValidator *mEffectSlotValidator;
     QValidator *mSourceSendValidator;
     QValidator *mSampleRateValidator;
+    QValidator *mJackBufferValidator;
+
+    bool mNeedsSave;
+
+    void closeEvent(QCloseEvent *event);
+
+    void selectDecoderFile(QLineEdit *line, const char *name);
+
+    QStringList collectHrtfs();
 
     void loadConfig(const QString &fname);
     void saveConfig(const QString &fname) const;