diff --git a/src/common/qprojectm_mainwindow.cpp b/src/common/qprojectm_mainwindow.cpp index 399cce0..800e2ca 100644 --- a/src/common/qprojectm_mainwindow.cpp +++ b/src/common/qprojectm_mainwindow.cpp @@ -286,7 +286,7 @@ void QProjectM_MainWindow::postProjectM_Initialize() if ((playlistFile = qSettings.value("PlaylistFile", QString()).toString()) == QString()) { auto projectMSettings = projectm_get_settings(qprojectM()->instance()); - url = QString(projectMSettings->preset_path); + url = QString(projectMSettings->preset_url); projectm_free_settings(projectMSettings); } else diff --git a/src/common/qprojectmconfigdialog.cpp b/src/common/qprojectmconfigdialog.cpp index 4ef65a1..81db351 100644 --- a/src/common/qprojectmconfigdialog.cpp +++ b/src/common/qprojectmconfigdialog.cpp @@ -126,14 +126,14 @@ void QProjectMConfigDialog::saveConfig() { // Will only keep data_dir. auto settings = projectm_get_settings(_qprojectMWidget->qprojectM()->instance()); - projectm_free_string(settings->preset_path); + projectm_free_string(settings->preset_url); settings->mesh_x = _ui.meshSizeWidthSpinBox->value(); settings->mesh_y = _ui.meshSizeHeightSpinBox->value(); settings->window_height = _ui.windowHeightSpinBox->value(); settings->window_width = _ui.windowWidthSpinBox->value(); - settings->preset_path = projectm_alloc_string(_ui.startupPlaylistDirectoryLineEdit->text().length() + 1); - strncpy(settings->preset_path, _ui.startupPlaylistDirectoryLineEdit->text().toLocal8Bit().data(), _ui.startupPlaylistDirectoryLineEdit->text().length()); + settings->preset_url = projectm_alloc_string(_ui.startupPlaylistDirectoryLineEdit->text().length() + 1); + strncpy(settings->preset_url, _ui.startupPlaylistDirectoryLineEdit->text().toLocal8Bit().data(), _ui.startupPlaylistDirectoryLineEdit->text().length()); settings->texture_size = _ui.textureSizeComboBox->itemData(_ui.textureSizeComboBox->currentIndex()).toInt(); settings->soft_cut_duration = _ui.smoothPresetDurationSpinBox->value(); settings->preset_duration = _ui.presetDurationSpinBox->value(); @@ -175,7 +175,7 @@ void QProjectMConfigDialog::loadConfig() { _ui.meshSizeWidthSpinBox->setValue(settings->mesh_x); _ui.meshSizeHeightSpinBox->setValue(settings->mesh_y); - _ui.startupPlaylistDirectoryLineEdit->setText(settings->preset_path); + _ui.startupPlaylistDirectoryLineEdit->setText(settings->preset_url); _ui.useAspectCorrectionCheckBox->setCheckState(settings->aspect_correction ? Qt::Checked : Qt::Unchecked); _ui.maxFPSSpinBox->setValue(settings->fps); _ui.beatSensitivitySpinBox->setValue(settings->beat_sensitivity); diff --git a/src/ui-jack/qprojectM-jack.cpp b/src/ui-jack/qprojectM-jack.cpp index 9879d91..c94ab2b 100644 --- a/src/ui-jack/qprojectM-jack.cpp +++ b/src/ui-jack/qprojectM-jack.cpp @@ -177,7 +177,7 @@ process (jack_nframes_t nframes, void *arg) //memcpy (out, in,sizeof (jack_default_audio_sample_t) * nframes); - projectm_pcm_add_float_1ch_data(globalPM, in, nframes); + projectm_pcm_add_float(globalPM, in, nframes, PROJECTM_MONO); // printf("%x %f\n",nframes,in[128]); return 0;