Fixed code to match recent API changes in libprojectM's master.

kblaschke · kblaschke · commit be15a20e477d · 2022-11-23T13:33:59.000+01:00
Please note the Qt frontend application is still inherently broken due to QOpenGLWindow rendering issues, which need to be addressed later.
diff --git a/src/common/qprojectm_mainwindow.cpp b/src/common/qprojectm_mainwindow.cpp
@@ -232,7 +232,7 @@ projectm* QProjectM_MainWindow::GetProjectM()
 
 void QProjectM_MainWindow::addPCM(float * buffer, unsigned int bufferSize)
 {
-    projectm_pcm_add_float_2ch_data(qprojectM()->instance(), buffer, bufferSize);
+    projectm_pcm_add_float(qprojectM()->instance(), buffer, bufferSize / 2, PROJECTM_STEREO);
 }
 
 void QProjectM_MainWindow::updatePlaylistSelection ( bool hardCut, unsigned int index )
@@ -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_url);
+		    url = QString(projectMSettings->preset_path);
 		    projectm_free_settings(projectMSettings);
         }
 		else
diff --git a/src/common/qprojectmconfigdialog.cpp b/src/common/qprojectmconfigdialog.cpp
@@ -126,20 +126,14 @@ void QProjectMConfigDialog::saveConfig() {
     // Will only keep data_dir.
     auto settings = projectm_get_settings(_qprojectMWidget->qprojectM()->instance());
 
-    projectm_free_string(settings->title_font_url);
-    projectm_free_string(settings->menu_font_url);
-    projectm_free_string(settings->preset_url);
+    projectm_free_string(settings->preset_path);
 
 	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->title_font_url = projectm_alloc_string(_ui.titleFontPathLineEdit->text().length() + 1);
-	strncpy(settings->title_font_url, _ui.titleFontPathLineEdit->text().toLocal8Bit().data(), _ui.titleFontPathLineEdit->text().length());
-	settings->menu_font_url = projectm_alloc_string(_ui.menuFontPathLineEdit->text().length() + 1);
-	strncpy(settings->menu_font_url, _ui.menuFontPathLineEdit->text().toLocal8Bit().data(), _ui.menuFontPathLineEdit->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->preset_path = projectm_alloc_string(_ui.startupPlaylistDirectoryLineEdit->text().length() + 1);
+	strncpy(settings->preset_path, _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();
@@ -181,10 +175,7 @@ void QProjectMConfigDialog::loadConfig() {
 	_ui.meshSizeWidthSpinBox->setValue(settings->mesh_x);
 	_ui.meshSizeHeightSpinBox->setValue(settings->mesh_y);
 
-	_ui.titleFontPathLineEdit->setText(settings->title_font_url);
-	_ui.menuFontPathLineEdit->setText(settings->menu_font_url);
-
-	_ui.startupPlaylistDirectoryLineEdit->setText(settings->preset_url);
+	_ui.startupPlaylistDirectoryLineEdit->setText(settings->preset_path);
 	_ui.useAspectCorrectionCheckBox->setCheckState(settings->aspect_correction ? Qt::Checked : Qt::Unchecked);
 	_ui.maxFPSSpinBox->setValue(settings->fps);
 	_ui.beatSensitivitySpinBox->setValue(settings->beat_sensitivity);

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ projectm* QProjectM_MainWindow::GetProjectM()`
`232`	`232`
`233`	`233`	`void QProjectM_MainWindow::addPCM(float * buffer, unsigned int bufferSize)`
`234`	`234`	`{`
`235`		`- projectm_pcm_add_float_2ch_data(qprojectM()->instance(), buffer, bufferSize);`
	`235`	`+ projectm_pcm_add_float(qprojectM()->instance(), buffer, bufferSize / 2, PROJECTM_STEREO);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`void QProjectM_MainWindow::updatePlaylistSelection ( bool hardCut, unsigned int index )`
`@@ -286,7 +286,7 @@ void QProjectM_MainWindow::postProjectM_Initialize()`
`286`	`286`	`if ((playlistFile = qSettings.value("PlaylistFile", QString()).toString()) == QString())`
`287`	`287`	`{`
`288`	`288`	`auto projectMSettings = projectm_get_settings(qprojectM()->instance());`
`289`		`- url = QString(projectMSettings->preset_url);`
	`289`	`+ url = QString(projectMSettings->preset_path);`
`290`	`290`	`projectm_free_settings(projectMSettings);`
`291`	`291`	`}`
`292`	`292`	`else`