dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove VLC

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-28 16:38:23 +02:00
parent 25451d361c
commit e4a57aa768
27 changed files with 287 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/devicemanager.cpp
View File

@@ -65,7 +65,7 @@
#ifdef HAVE_GIO
# include "giolister.h"
#endif
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
#ifdef HAVE_AUDIOCD
# include "cddalister.h"
# include "cddadevice.h"
#endif
@@ -115,7 +115,7 @@ DeviceManager::DeviceManager(Application *app, QObject *parent)
connected_devices_model_->setSourceModel(this);
// CD devices are detected via the DiskArbitration framework instead on MacOs.
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) && !defined(Q_OS_MACOS)
#if defined(HAVE_AUDIOCD) && !defined(Q_OS_MACOS)
AddLister(new CddaLister);
#endif
#if defined(HAVE_DBUS) && defined(HAVE_UDISKS2)
@@ -128,7 +128,7 @@ DeviceManager::DeviceManager(Application *app, QObject *parent)
AddLister(new MacOsDeviceLister);
#endif
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
#ifdef HAVE_AUDIOCD
AddDeviceClass<CddaDevice>();
#endif

8
src/device/deviceproperties.cpp
View File

@@ -54,9 +54,7 @@
#include "devicelister.h"
#include "devicemanager.h"
#include "deviceproperties.h"
#ifdef HAVE_GSTREAMER
# include "transcoder/transcoder.h"
#endif
#include "transcoder/transcoder.h"
#include "ui_deviceproperties.h"
DeviceProperties::DeviceProperties(QWidget *parent)
@@ -103,14 +101,12 @@ void DeviceProperties::ShowDevice(const QModelIndex &idx) {
item->setData(Qt::UserRole, icon_name);
}
#ifdef HAVE_GSTREAMER
// Load the transcode formats the first time the dialog is shown
const QList<TranscoderPreset> presets = Transcoder::GetAllPresets();
for (const TranscoderPreset &preset : presets) {
ui_->transcode_format->addItem(preset.name_, QVariant::fromValue(preset.filetype_));
}
ui_->transcode_format->model()->sort(0);
#endif
}
index_ = idx;
@@ -310,7 +306,6 @@ void DeviceProperties::UpdateFormatsFinished() {
}
ui_->supported_formats->sortItems();
#ifdef HAVE_GSTREAMER
// Set the format combobox item
TranscoderPreset preset = Transcoder::PresetForFileType(static_cast<Song::FileType>(index_.data(DeviceManager::Role_TranscodeFormat).toInt()));
if (preset.filetype_ == Song::FileType::Unknown) {
@@ -319,7 +314,6 @@ void DeviceProperties::UpdateFormatsFinished() {
preset = Transcoder::PresetForFileType(Transcoder::PickBestFormat(supported_formats_));
}
ui_->transcode_format->setCurrentIndex(ui_->transcode_format->findText(preset.name_));
#endif
ui_->formats_stack->setCurrentWidget(ui_->formats_page);