diff -urN aqemu-0.8.2.orig/Main_Window.cpp aqemu-0.8.2/Main_Window.cpp
old
|
new
|
|
316 | 316 | connect( ui.CH_Adlib, SIGNAL(clicked()), |
317 | 317 | this, SLOT(VM_Changet()) ); |
318 | 318 | |
| 319 | connect( ui.CH_hda, SIGNAL(clicked()), |
| 320 | this, SLOT(VM_Changet()) ); |
| 321 | |
319 | 322 | connect( ui.CH_AC97, SIGNAL(clicked()), |
320 | 323 | this, SLOT(VM_Changet()) ); |
321 | 324 | |
… |
… |
|
801 | 804 | if( ui.CH_Adlib->isChecked() ) snd_card.Audio_Adlib = true; |
802 | 805 | else snd_card.Audio_Adlib = false; |
803 | 806 | |
| 807 | if( ui.CH_hda->isChecked() ) snd_card.Audio_hda = true; |
| 808 | else snd_card.Audio_hda = false; |
| 809 | |
804 | 810 | if( ui.CH_PCSPK->isChecked() ) snd_card.Audio_PC_Speaker = true; |
805 | 811 | else snd_card.Audio_PC_Speaker = false; |
806 | 812 | |
… |
… |
|
1489 | 1495 | if( tmp_vm->Get_Audio_Cards().Audio_Adlib ) ui.CH_Adlib->setChecked( true ); |
1490 | 1496 | else ui.CH_Adlib->setChecked( false ); |
1491 | 1497 | |
| 1498 | if( tmp_vm->Get_Audio_Cards().Audio_hda ) ui.CH_hda->setChecked( true ); |
| 1499 | else ui.CH_hda->setChecked( false ); |
| 1500 | |
1492 | 1501 | if( tmp_vm->Get_Audio_Cards().Audio_PC_Speaker ) ui.CH_PCSPK->setChecked( true ); |
1493 | 1502 | else ui.CH_PCSPK->setChecked( false ); |
1494 | 1503 | |
… |
… |
|
2116 | 2125 | cell_cursor = cell.firstCursorPosition(); |
2117 | 2126 | |
2118 | 2127 | if( ui.CH_sb16->isChecked() || ui.CH_es1370->isChecked() || ui.CH_Adlib->isChecked() || |
| 2128 | ui.CH_hda->isChecked() || |
2119 | 2129 | ui.CH_AC97->isChecked() || ui.CH_GUS->isChecked() || ui.CH_PCSPK->isChecked() ) |
2120 | 2130 | { |
2121 | 2131 | cell_cursor.insertText( tr("Yes"), format ); |
… |
… |
|
6090 | 6100 | if( curComp.Audio_Card_List.Audio_Adlib ) ui.CH_Adlib->setEnabled( true ); |
6091 | 6101 | else ui.CH_Adlib->setEnabled( false ); |
6092 | 6102 | |
| 6103 | if( curComp.Audio_Card_List.Audio_hda ) ui.CH_hda->setEnabled( true ); |
| 6104 | else ui.CH_hda->setEnabled( false ); |
| 6105 | |
6093 | 6106 | if( curComp.Audio_Card_List.Audio_AC97 ) ui.CH_AC97->setEnabled( true ); |
6094 | 6107 | else ui.CH_AC97->setEnabled( false ); |
6095 | 6108 | |
diff -urN aqemu-0.8.2.orig/Main_Window.ui aqemu-0.8.2/Main_Window.ui
old
|
new
|
|
1123 | 1123 | </property> |
1124 | 1124 | </widget> |
1125 | 1125 | </item> |
| 1126 | <item row="0" column="5"> |
| 1127 | <spacer> |
| 1128 | <property name="orientation"> |
| 1129 | <enum>Qt::Horizontal</enum> |
| 1130 | </property> |
| 1131 | <property name="sizeHint" stdset="0"> |
| 1132 | <size> |
| 1133 | <width>16</width> |
| 1134 | <height>20</height> |
| 1135 | </size> |
| 1136 | </property> |
| 1137 | </spacer> |
| 1138 | </item> |
| 1139 | <item row="0" column="6"> |
| 1140 | <widget class="QCheckBox" name="CH_hda"> |
| 1141 | <property name="text"> |
| 1142 | <string>&Intel HD Audio</string> |
| 1143 | </property> |
| 1144 | <property name="checked"> |
| 1145 | <bool>false</bool> |
| 1146 | </property> |
| 1147 | </widget> |
| 1148 | </item> |
1126 | 1149 | <item row="1" column="0"> |
1127 | 1150 | <widget class="QCheckBox" name="CH_AC97"> |
1128 | 1151 | <property name="text"> |
… |
… |
|
4739 | 4762 | <tabstop>CH_es1370</tabstop> |
4740 | 4763 | <tabstop>CH_GUS</tabstop> |
4741 | 4764 | <tabstop>CH_Adlib</tabstop> |
| 4765 | <tabstop>CH_hda</tabstop> |
4742 | 4766 | <tabstop>CH_PCSPK</tabstop> |
4743 | 4767 | <tabstop>CH_Fullscreen</tabstop> |
4744 | 4768 | <tabstop>CH_Local_Time</tabstop> |
diff -urN aqemu-0.8.2.orig/System_Info.cpp aqemu-0.8.2/System_Info.cpp
old
|
new
|
|
559 | 559 | Audio_Card_x86.Audio_PC_Speaker = true; |
560 | 560 | Audio_Card_x86.Audio_sb16 = true; |
561 | 561 | Audio_Card_x86.Audio_Adlib = true; |
| 562 | Audio_Card_x86.Audio_hda = true; |
562 | 563 | Audio_Card_x86.Audio_es1370 = true; |
563 | 564 | |
564 | 565 | Audio_Card_PPC.Audio_sb16 = true; |
… |
… |
|
2364 | 2365 | if( qemu_dev_name == "sb16" ) tmp_dev.Audio_Card_List.Audio_sb16 = true; |
2365 | 2366 | else if( qemu_dev_name == "es1370" ) tmp_dev.Audio_Card_List.Audio_es1370 = true; |
2366 | 2367 | else if( qemu_dev_name == "gus" ) tmp_dev.Audio_Card_List.Audio_Adlib = true; |
| 2368 | else if( qemu_dev_name == "hda" ) tmp_dev.Audio_Card_List.Audio_hda = true; |
2367 | 2369 | else if( qemu_dev_name == "adlib" ) tmp_dev.Audio_Card_List.Audio_PC_Speaker = true; |
2368 | 2370 | else if( qemu_dev_name == "pcspk" ) tmp_dev.Audio_Card_List.Audio_GUS = true; |
2369 | 2371 | else if( qemu_dev_name == "ac97" ) tmp_dev.Audio_Card_List.Audio_AC97 = true; |
diff -urN aqemu-0.8.2.orig/VM.cpp aqemu-0.8.2/VM.cpp
old
|
new
|
|
1143 | 1143 | |
1144 | 1144 | Sec_Element.appendChild( Dom_Text ); |
1145 | 1145 | |
| 1146 | // Audio_hda |
| 1147 | Sec_Element = New_Dom_Document.createElement( "Audio_hda" ); |
| 1148 | Dom_Element.appendChild( Sec_Element ); |
| 1149 | |
| 1150 | if( Audio_Card.Audio_hda ) |
| 1151 | Dom_Text = New_Dom_Document.createTextNode( "true" ); |
| 1152 | else |
| 1153 | Dom_Text = New_Dom_Document.createTextNode( "false" ); |
| 1154 | |
| 1155 | Sec_Element.appendChild( Dom_Text ); |
| 1156 | |
1146 | 1157 | // Audio_PC_Speaker |
1147 | 1158 | Sec_Element = New_Dom_Document.createElement( "Audio_PC_Speaker" ); |
1148 | 1159 | Dom_Element.appendChild( Sec_Element ); |
… |
… |
|
3732 | 3743 | // Audio_Adlib |
3733 | 3744 | snd_card.Audio_Adlib = Second_Element.firstChildElement("Audio_Adlib").text() == "true"; |
3734 | 3745 | |
| 3746 | // Audio_hda |
| 3747 | snd_card.Audio_hda = Second_Element.firstChildElement("Audio_hda").text() == "true"; |
| 3748 | |
3735 | 3749 | // Audio_PC_Speaker |
3736 | 3750 | snd_card.Audio_PC_Speaker = Second_Element.firstChildElement("Audio_PC_Speaker").text() == "true"; |
3737 | 3751 | |
… |
… |
|
5156 | 5170 | if( Audio_Card.Audio_sb16 && Current_Emulator_Devices.Audio_Card_List.Audio_sb16 ) audio_list << "sb16"; |
5157 | 5171 | if( Audio_Card.Audio_es1370 && Current_Emulator_Devices.Audio_Card_List.Audio_es1370 ) audio_list << "es1370"; |
5158 | 5172 | if( Audio_Card.Audio_Adlib && Current_Emulator_Devices.Audio_Card_List.Audio_Adlib ) audio_list << "adlib"; |
| 5173 | if( Audio_Card.Audio_hda && Current_Emulator_Devices.Audio_Card_List.Audio_hda ) audio_list << "hda"; |
5159 | 5174 | if( Audio_Card.Audio_PC_Speaker && Current_Emulator_Devices.Audio_Card_List.Audio_PC_Speaker ) audio_list << "pcspk"; |
5160 | 5175 | if( Audio_Card.Audio_GUS && Current_Emulator_Devices.Audio_Card_List.Audio_GUS ) audio_list << "gus"; |
5161 | 5176 | if( Audio_Card.Audio_AC97 && Current_Emulator_Devices.Audio_Card_List.Audio_AC97 ) audio_list << "ac97"; |
diff -urN aqemu-0.8.2.orig/VM_Devices.cpp aqemu-0.8.2/VM_Devices.cpp
old
|
new
|
|
421 | 421 | tmpDev.Audio_Card_List.Audio_sb16 = (thirdElement.firstChildElement("sb16").text() == "yes"); |
422 | 422 | tmpDev.Audio_Card_List.Audio_es1370 = (thirdElement.firstChildElement("es1370").text() == "yes"); |
423 | 423 | tmpDev.Audio_Card_List.Audio_Adlib = (thirdElement.firstChildElement("Adlib").text() == "yes"); |
| 424 | tmpDev.Audio_Card_List.Audio_hda = (thirdElement.firstChildElement("hda").text() == "yes"); |
424 | 425 | tmpDev.Audio_Card_List.Audio_PC_Speaker = (thirdElement.firstChildElement("PC_Speaker").text() == "yes"); |
425 | 426 | tmpDev.Audio_Card_List.Audio_GUS = (thirdElement.firstChildElement("GUS").text() == "yes"); |
426 | 427 | tmpDev.Audio_Card_List.Audio_AC97 = (thirdElement.firstChildElement("AC97").text() == "yes"); |
… |
… |
|
765 | 766 | thirdElement.appendChild( domText ); |
766 | 767 | deviceElement.appendChild( thirdElement ); |
767 | 768 | |
| 769 | thirdElement = domDocument.createElement( "hda" ); |
| 770 | domText = domDocument.createTextNode( (tmpDev.Audio_Card_List.Audio_hda ? "yes" : "no") ); |
| 771 | thirdElement.appendChild( domText ); |
| 772 | deviceElement.appendChild( thirdElement ); |
| 773 | |
768 | 774 | thirdElement = domDocument.createElement( "PC_Speaker" ); |
769 | 775 | domText = domDocument.createTextNode( (tmpDev.Audio_Card_List.Audio_PC_Speaker ? "yes" : "no") ); |
770 | 776 | thirdElement.appendChild( domText ); |
diff -urN aqemu-0.8.2.orig/VM_Devices.h aqemu-0.8.2/VM_Devices.h
old
|
new
|
|
51 | 51 | bool Audio_sb16; |
52 | 52 | bool Audio_es1370; |
53 | 53 | bool Audio_Adlib; |
| 54 | bool Audio_hda; |
54 | 55 | bool Audio_PC_Speaker; |
55 | 56 | bool Audio_GUS; |
56 | 57 | bool Audio_AC97; |
57 | 58 | |
58 | 59 | Sound_Cards() |
59 | 60 | { |
60 | | Audio_sb16 = Audio_es1370 = Audio_Adlib = Audio_PC_Speaker = Audio_GUS = Audio_AC97 = false; |
| 61 | Audio_sb16 = Audio_es1370 = Audio_Adlib = Audio_hda = Audio_PC_Speaker = Audio_GUS = Audio_AC97 = false; |
61 | 62 | } |
62 | 63 | |
63 | 64 | bool operator==( const Sound_Cards &v ) const |
… |
… |
|
65 | 66 | if( Audio_sb16 == v.Audio_sb16 && |
66 | 67 | Audio_es1370 == v.Audio_es1370 && |
67 | 68 | Audio_Adlib == v.Audio_Adlib && |
| 69 | Audio_hda == v.Audio_hda && |
68 | 70 | Audio_PC_Speaker == v.Audio_PC_Speaker && |
69 | 71 | Audio_GUS == v.Audio_GUS && |
70 | 72 | Audio_AC97 == v.Audio_AC97 ) |