Changeset 1347

Timestamp:

05/22/08 07:25:34 (1 month ago)

Author:

astormont

Message:

Implemented getting of wine audio settingsin preferences -- setting doesnt work yet

Files:

• wine-doors/trunk/repos/regen-packlist.py (modified) (2 diffs)
• wine-doors/trunk/src/ui.py (modified) (2 diffs)
• wine-doors/trunk/src/wine.py (modified) (1 diff)
• wine-doors/trunk/src/winedoors.glade (modified) (7 diffs)

wine-doors/trunk/repos/regen-packlist.py

@@ -3 +3 @@
-# As the name suggests, in the future this script will be used
-# to automatically regenerate the packlists for each repo.
+#
+# Updating the packlists manually is a real PITA, and inconsistencies 
+# between the packlists and pack files were the cause of many bugs in 0.1.1
-#
-# At the momment all it does is act as a very basic pack.xml validator
@@ -42 +45 @@
-                          "homepage": pack_dom.getElementsByTagName("homepage")[0].firstChild.data,
-                          "category": pack_dom.getElementsByTagName("category")[0].firstChild.data,
-
-
+
+
+
+
-        except:
-            print " *** Warning: Package \"" + pack + "\" is missing meta data *** "

wine-doors/trunk/src/ui.py

@@ -163 +163 @@
-
-        if preferences['hideprograms'] == True:
-system("chmod 000 ~/.local/share/applications/wine"
+chmod( os.path.expanduser("~/.local/share/applications/wine"), 0000
-        else:
-
-
-
+
+
+
+
+
-
-        model = wn_prefs['tv_repos'].get_model()
@@ -392 +394 @@
-        #    for engine in os.listdir( os.path.expanduser("~/.cedega/.winex_ver/") ):
-        #        wn_prefs['cb_winever'].prepend_text( engine.replace("winex", "cedega") )
+
+        # Do audio
+        wn_prefs['cb_audio'].append_text( wine.getRegistry( "HKCU\\\\Software\\\\Wine\\\\Drivers", "Audio" ) )
+        wn_prefs['cb_audio'].set_active(0)
+        for item in wine.AudioSystems():
+            if item != wn_prefs['cb_audio'].get_active_text():
+                wn_prefs['cb_audio'].append_text( item )
-        
-        model = gtk.ListStore( gobject.TYPE_STRING, 

wine-doors/trunk/src/wine.py

@@ -27 +27 @@
-            if line.find("pulseaudio") == -1:
-                return line.rstrip().split("-")[1]
+
+    def AudioSystems( self ):
+        """ Returns a list of supported audio systems """
+        audio_sys = []
+        if os.path.isfile( "/usr/lib/wine/winealsa.drv.so" ):
+            audio_sys.append( "alsa" )
+        if os.path.isfile( "/usr/lib/wine/winejack.drv.so" ):
+            audio_sys.append( "jack" )
+        if os.path.isfile( "/usr/lib/wine/wineoss.drv.so" ):
+            audio_sys.append( "oss" )
+        if os.path.isfile( "/usr/lib/wine/wineesd.drv.so" ):
+            audio_sys.append( "esd" )
+        return audio_sys
-
-    def CountInstances( self, process_name="wine" ):

wine-doors/trunk/src/winedoors.glade

@@ -538 +538 @@
-                  <widget class="GtkFileChooserButton" id="file_wineroot">
-                    <property name="visible">True</property>
+                    <property name="show_hidden">True</property>
-                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
-                    <property name="show_hidden">True</property>
-                    <property name="title" translatable="yes">Select wine root</property>
-                  </widget>
@@ -1300 +1300 @@
-                  <widget class="GtkComboBox" id="cb_audio">
-                    <property name="visible">True</property>
-
-
-
+
-                  </widget>
-                  <packing>
@@ -2437 +2435 @@
-            </child>
-            <child>
-
+1
-                <property name="width_request">300</property>
-                <property name="visible">True</property>
@@ -3172 +3170 @@
-                <property name="visible">True</property>
-                <child>
-
+1
-                    <property name="height_request">25</property>
-                    <property name="pulse_step">0.10000000149</property>
@@ -3211 +3209 @@
-                </child>
-                <child>
-
+1
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
@@ -3306 +3304 @@
-        </child>
-        <child>
-
+2
-            <property name="xalign">0</property>
-            <property name="use_markup">True</property>
@@ -5427 +5425 @@
-                </child>
-                <child>
-1
+2
-                    <property name="height_request">27</property>
-                    <property name="visible">True</property>