Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kemu: adjust to soundhw argument removal

Browse source 
note that even if the audio driver is not installed QEMU may just issue
a warning

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-14 00:11:39 +02:00
parent 2854d0dbde
commit 59656a3e3e
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kemu/kded/kded_kemu.cpp
View file

@ -63,7 +63,7 @@ bool KEmuModule::start(const QString &machine)
const QUrl harddisk = settings.value(machine + "/harddisk").toUrl(); const QUrl harddisk = settings.value(machine + "/harddisk").toUrl();
const QString system = settings.value(machine + "/system").toString(); const QString system = settings.value(machine + "/system").toString();
const QString video = settings.value(machine + "/video", "virtio").toString(); const QString video = settings.value(machine + "/video", "virtio").toString();
const QString audio = settings.value(machine + "/audio", "ac97").toString(); const QString audio = settings.value(machine + "/audio", "alsa").toString();
const int ram = settings.value(machine + "/ram", 512).toInt(); const int ram = settings.value(machine + "/ram", 512).toInt();
const int cpu = settings.value(machine + "/cpu", 1).toInt(); const int cpu = settings.value(machine + "/cpu", 1).toInt();
const bool kvm = settings.value(machine + "/kvm", false).toBool(); const bool kvm = settings.value(machine + "/kvm", false).toBool();
@ -85,7 +85,7 @@ bool KEmuModule::start(const QString &machine)
machineArgs << "-hda" << harddisk.toString(); machineArgs << "-hda" << harddisk.toString();
} }
machineArgs << "-vga" << video; machineArgs << "-vga" << video;
machineArgs << "-soundhw" << audio; machineArgs << "-audiodev" << QString::fromLatin1("driver=%1,id=none").arg(audio);
machineArgs << "-m" << QString::number(ram); machineArgs << "-m" << QString::number(ram);
machineArgs << "-smp" << QString::number(cpu); machineArgs << "-smp" << QString::number(cpu);
if (kvm) { if (kvm) {

21
kemu/kemu.ui
View file

@ -231,47 +231,42 @@
<widget class="QComboBox" name="audioComboBox"> <widget class="QComboBox" name="audioComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>sb16</string> <string>alsa</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>es1370</string> <string>dbus</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>ac97</string> <string>jack</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>adlib</string> <string>oss</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>gus</string> <string>pa</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>cs4231a</string> <string>sdl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>hda</string> <string>spice</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>pcspk</string> <string>none</string>
</property>
</item>
<item>
<property name="text">
<string>all</string>
</property> </property>
</item> </item>
</widget> </widget>

2
kemu/kemumainwindow.cpp
View file

@ -265,7 +265,7 @@ void KEmuMainWindow::machineLoad(const QString machine)
const QString video = m_settings->value(machine + "/video", "virtio").toString(); const QString video = m_settings->value(machine + "/video", "virtio").toString();
const int videoIndex = m_kemuui->videoComboBox->findText(video); const int videoIndex = m_kemuui->videoComboBox->findText(video);
m_kemuui->videoComboBox->setCurrentIndex(videoIndex); m_kemuui->videoComboBox->setCurrentIndex(videoIndex);
const QString audio = m_settings->value(machine + "/audio", "ac97").toString(); const QString audio = m_settings->value(machine + "/audio", "alsa").toString();
const int audioIndex = m_kemuui->audioComboBox->findText(audio); const int audioIndex = m_kemuui->audioComboBox->findText(audio);
m_kemuui->audioComboBox->setCurrentIndex(audioIndex); m_kemuui->audioComboBox->setCurrentIndex(audioIndex);
m_kemuui->RAMInput->setValue(m_settings->value(machine + "/ram", 512).toInt()); m_kemuui->RAMInput->setValue(m_settings->value(machine + "/ram", 512).toInt());