Merge pull request #987 from mikusp/qtmedia

Add Use MediaEngine option to Qt interface
This commit is contained in:
Henrik Rydgård 2013-03-14 09:16:46 -07:00
commit 7d89b12823
3 changed files with 29 additions and 1 deletions

View File

@ -204,6 +204,7 @@ void MainWindow::UpdateMenus()
ui->action_FileQuickSaveState->setEnabled(!enable);
ui->action_CPUDynarec->setEnabled(enable);
ui->action_CPUInterpreter->setEnabled(enable);
ui->actionUse_MediaEngine->setEnabled(enable);
ui->action_DebugDumpFrame->setEnabled(!enable);
ui->action_DebugDisassembly->setEnabled(!enable);
ui->action_DebugMemoryView->setEnabled(!enable);
@ -222,6 +223,7 @@ void MainWindow::UpdateMenus()
ui->action_CPUDynarec->setChecked(g_Config.bJit);
ui->action_OptionsFastMemory->setChecked(g_Config.bFastMemory);
ui->action_OptionsIgnoreIllegalReadsWrites->setChecked(g_Config.bIgnoreBadMemAccess);
ui->actionUse_MediaEngine->setChecked(g_Config.bUseMediaEngine);
ui->action_AFOff->setChecked(g_Config.iAnisotropyLevel == 0);
ui->action_AF2x->setChecked(g_Config.iAnisotropyLevel == 2);
@ -558,6 +560,12 @@ void MainWindow::on_action_OptionsIgnoreIllegalReadsWrites_triggered()
UpdateMenus();
}
void MainWindow::on_actionUse_MediaEngine_triggered()
{
g_Config.bUseMediaEngine = !g_Config.bUseMediaEngine;
UpdateMenus();
}
void MainWindow::on_action_OptionsControls_triggered()
{
controls->show();

View File

@ -79,6 +79,7 @@ private slots:
void on_action_CPUInterpreter_triggered();
void on_action_OptionsFastMemory_triggered();
void on_action_OptionsIgnoreIllegalReadsWrites_triggered();
void on_actionUse_MediaEngine_triggered();
// Controls
void on_action_OptionsControls_triggered();

View File

@ -30,7 +30,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -187,6 +196,8 @@
<addaction name="separator"/>
<addaction name="action_OptionsFastMemory"/>
<addaction name="action_OptionsIgnoreIllegalReadsWrites"/>
<addaction name="separator"/>
<addaction name="actionUse_MediaEngine"/>
</widget>
<addaction name="menuCore"/>
<addaction name="menuControls"/>
@ -704,6 +715,14 @@
<string>Frameskip</string>
</property>
</action>
<action name="actionUse_MediaEngine">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Use MediaEngine</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>