diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp index 8374027..bb53670 100644 --- a/src/AudioPlayer.cpp +++ b/src/AudioPlayer.cpp @@ -69,7 +69,7 @@ void AudioPlayer::play(std::shared_ptr audioData) buffer->setParent(this); // Use QMediaPlayer::setSourceDevice for in-memory playback - mediaPlayer->setSourceDevice(buffer); + mediaPlayer->setSourceDevice(buffer, QUrl("memory://audio.wav")); mediaPlayer->play(); // Start position timer @@ -120,19 +120,6 @@ int AudioPlayer::position() const return mediaPlayer->position(); } -void AudioPlayer::setVolume(int volume) -{ - // Convert from 0-100 range to 0.0-1.0 range - qreal volumeLevel = static_cast(volume) / 100.0; - audioOutput->setVolume(volumeLevel); -} - -int AudioPlayer::getVolume() const -{ - // Convert from 0.0-1.0 range to 0-100 range - return static_cast(audioOutput->volume() * 100); -} - void AudioPlayer::handlePlaybackStateChanged(QMediaPlayer::PlaybackState state) { if (state == QMediaPlayer::PlayingState) diff --git a/src/AudioPlayer.h b/src/AudioPlayer.h index 144010f..e1d0b47 100644 --- a/src/AudioPlayer.h +++ b/src/AudioPlayer.h @@ -32,8 +32,6 @@ public: bool isPlaying() const; int duration() const; int position() const; - void setVolume(int volume); - int getVolume() const; signals: void playbackStarted(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 565e8a4..85d9cc4 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -54,7 +54,6 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->skipButton, &QPushButton::clicked, this, &MainWindow::onSkipButtonClicked); connect(ui->stopButton, &QPushButton::clicked, this, &MainWindow::onStopButtonClicked); connect(ui->shuffleButton, &QPushButton::clicked, this, &MainWindow::onShuffleButtonClicked); - connect(ui->volumeSlider, &QSlider::valueChanged, this, &MainWindow::onVolumeSliderValueChanged); connect(ui->addSongButton, &QPushButton::clicked, this, &MainWindow::onAddSongButtonClicked); connect(ui->removeSongButton, &QPushButton::clicked, this, &MainWindow::onRemoveSongButtonClicked); connect(ui->actionAdvancedSettings, &QAction::triggered, this, &MainWindow::onAdvancedSettingsButtonClicked); @@ -62,7 +61,6 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->actionLoadPlaylist, &QAction::triggered, this, &MainWindow::onActionLoadPlaylist); connect(ui->actionAppendPlaylist, &QAction::triggered, this, &MainWindow::onActionAppendPlaylist); connect(ui->actionSaveSong, &QAction::triggered, this, &MainWindow::onActionSaveSong); - connect(ui->positionSlider, &QSlider::sliderMoved, this, &MainWindow::onPositionSliderSliderMoved); connect(ui->actionQuit, &QAction::triggered, this, [this]() { close(); @@ -112,9 +110,6 @@ MainWindow::MainWindow(QWidget *parent) currentSong = songModel->getSong(0); - // Set default volume (50% from UI) - audioPlayer->setVolume(ui->volumeSlider->value()); - // Start the worker thread and enter its event loop QObject::connect(&aceThread, &QThread::started, [this]() {qDebug() << "Worker thread started";}); aceThread.start(); @@ -165,10 +160,6 @@ void MainWindow::loadSettings() shuffleMode = settings.value("shuffleMode", false).toBool(); ui->shuffleButton->setChecked(shuffleMode); - // Load volume setting - int savedVolume = settings.value("volume", 50).toInt(); - ui->volumeSlider->setValue(savedVolume); - // Load path settings with defaults based on application directory QString appDir = QCoreApplication::applicationDirPath(); qwen3ModelPath = settings.value("qwen3ModelPath", @@ -197,9 +188,6 @@ void MainWindow::saveSettings() // Save shuffle mode settings.setValue("shuffleMode", shuffleMode); - // Save volume setting - settings.setValue("volume", ui->volumeSlider->value()); - // Save path settings settings.setValue("qwen3ModelPath", qwen3ModelPath); settings.setValue("textEncoderModelPath", textEncoderModelPath); @@ -559,11 +547,6 @@ void MainWindow::onPositionSliderSliderMoved(int position) } } -void MainWindow::onVolumeSliderValueChanged(int value) -{ - audioPlayer->setVolume(value); -} - void MainWindow::ensureSongsInQueue(bool enqeueCurrent) { // Only generate more songs if we're playing and not already at capacity diff --git a/src/MainWindow.h b/src/MainWindow.h index 25cdf9d..6b3663f 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -73,7 +73,6 @@ private slots: void onStopButtonClicked(); void onShuffleButtonClicked(); void onPositionSliderSliderMoved(int position); - void onVolumeSliderValueChanged(int value); void updatePosition(int position); void updateDuration(int duration); void onAddSongButtonClicked(); diff --git a/src/MainWindow.ui b/src/MainWindow.ui index 37a6f78..8d0a9ef 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -222,56 +222,14 @@ - - - - Qt::Orientation::Horizontal - - - - 15 - 20 - - - - - - - - Volume: - - - - - - - - 100 - 20 - - - - 100 - - - 50 - - - Qt::Orientation::Horizontal - - - Qt::Orientation::Horizontal - - QSizePolicy::Policy::Fixed - - 35 + 40 20