puae 2.3.1

src/catweasel.c

@@ -407,4 +407,23 @@ static int catweasel4_configure (void)
 	return 1;
 }
 
+static int detected;
+
+void catweasel_free (void)
+{
+}
+
+int catweasel_init(void)
+{
+fail:
+	catweasel_free ();
+	return 0;
+}
+
+int catweasel_detect (void)
+{
+        if (detected)
+                return detected < 0 ? 0 : 1;
+} 
+
 #endif

src/gui-qt/Makefile.am

@@ -25,11 +25,11 @@ AR_FLAGS = $(LIBS)
 
 noinst_LIBRARIES = libguidep.a
 
-libguidep_a_SOURCES = puae_mainwindow.cpp moc_puae_mainwindow.cpp puae_bridge.cpp moc_puae_bridge.cpp
+libguidep_a_SOURCES = puae_mainwindow.cpp moc_puae_mainwindow.cpp puae_bridge.cpp moc_puae_bridge.cpp puae_misc.cpp moc_puae_misc.cpp
 
-noinst_HEADERS = puae_mainwindow.h puae_bridge.h ui_puae_mainwindow.h
+noinst_HEADERS = puae_mainwindow.h ui_puae_mainwindow.h puae_bridge.h puae_misc.h
 
-BUILT_SOURCES = moc_puae_mainwindow.cpp moc_puae_bridge.cpp ui_puae_mainwindow.h
+BUILT_SOURCES = moc_puae_mainwindow.cpp moc_puae_bridge.cpp moc_puae_misc.cpp ui_puae_mainwindow.h
 
 CLEANFILES = *.o qrc*.* ui*.* moc*.*
 

src/gui-qt/PUAE.pro.user

@@ -18,40 +18,6 @@
    <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
    <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
    <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
-     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
-    </valuemap>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
-     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
-     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
-    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
-     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
-      <value type="QString">clean</value>
-     </valuelist>
-     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
-    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
-    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/gnostic/qt_workspace/PUAE/PUAE-build-desktop</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
-   </valuemap>
-   <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
@@ -85,7 +51,7 @@
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
-   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
+   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">1</value>
    <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">PUAE</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>

src/gui-qt/puae_mainwindow.h

@@ -118,9 +118,9 @@ private slots:
     void out_floppyspeed();
     void updatez3 (unsigned int *size1p, unsigned int *size2p);
     int getcpufreq (int);
+    void display_fromselect (int val, int *fs, int *vsync, int p96);
 //
     void enable_for_memorydlg ();
-    void values_from_memorydlg ();
     void values_to_memorydlg ();
     void fix_values_memorydlg ();
 //

src/gui-qt/puae_mainwindow.ui

@@ -168,7 +168,7 @@
      <item>
       <widget class="QTabWidget" name="tab_main">
        <property name="currentIndex">
-        <number>4</number>
+        <number>5</number>
        </property>
        <widget class="QWidget" name="tab_about">
         <attribute name="title">
@@ -4012,7 +4012,7 @@
           <item>
            <widget class="QTabWidget" name="tab_host_main">
             <property name="currentIndex">
-             <number>0</number>
+             <number>1</number>
             </property>
             <widget class="QWidget" name="tab_host_display">
              <attribute name="title">
@@ -4534,7 +4534,7 @@
              <attribute name="title">
               <string>Sound</string>
              </attribute>
-             <widget class="QComboBox" name="comboBox_5">
+             <widget class="QComboBox" name="IDC_SOUNDCARDLIST">
               <property name="geometry">
                <rect>
                 <x>5</x>
@@ -4640,7 +4640,7 @@
               <property name="title">
                <string>Volume</string>
               </property>
-              <widget class="QSlider" name="horizontalSlider_2">
+              <widget class="QSlider" name="IDC_SOUNDVOLUME">
                <property name="geometry">
                 <rect>
                  <x>10</x>
@@ -4656,7 +4656,7 @@
                 <enum>Qt::Horizontal</enum>
                </property>
               </widget>
-              <widget class="QLineEdit" name="lineEdit_4">
+              <widget class="QLineEdit" name="IDC_SOUNDVOLUME2">
                <property name="geometry">
                 <rect>
                  <x>225</x>
@@ -4701,7 +4701,7 @@
                 <enum>Qt::Horizontal</enum>
                </property>
               </widget>
-              <widget class="QLineEdit" name="lineEdit_5">
+              <widget class="QLineEdit" name="IDC_SOUNDBUFFERTEXT">
                <property name="geometry">
                 <rect>
                  <x>225</x>
@@ -6201,7 +6201,7 @@
      <x>0</x>
      <y>0</y>
      <width>703</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
   </widget>