Changeset 1070

Timestamp:

04/29/08 08:29:27 (15 years ago)

Author:

ppalmers

Message:

some small cosmetic fixes

Files:

• trunk/libffado/SConstruct (modified) (2 diffs)
• trunk/libffado/support/mixer/ffadomixer.in (modified) (1 diff)
• trunk/libffado/support/mixer/ffado_regdialog.ui (modified) (2 diffs)
• trunk/libffado/support/mixer/ffado_registration.py (modified) (2 diffs)

trunk/libffado/SConstruct

@@ -25 +25 @@
-
-FFADO_API_VERSION="8"
-0
+1
-
-import os
@@ -63 +63 @@
-        PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathOption.PathAccept ),
-        BoolOption( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ),
-avc
-otu
+AV/C
+OTU
-        BoolOption( "ENABLE_DICE", "Enable/Disable the DICE part.", False ),
-        BoolOption( "ENABLE_METRIC_HALO", "Enable/Disable the Metric Halo part.", False ),

trunk/libffado/support/mixer/ffadomixer.in

@@ -323 +323 @@
-    if mw.count() > 0:
-        mw.show()
-
-        QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()"))
-

trunk/libffado/support/mixer/ffado_regdialog.ui

@@ -1 +1 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>ffadoRegDialogUI</class>
+<comment>Copyright (C) 2005-2008 by Pieter Palmers
+  
+  This file is part of FFADO
+  FFADO = Free Firewire (pro-)audio drivers for linux
+  
+  FFADO is based upon FreeBoB.
+  
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) version 3 of the License.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+</comment>
-<widget class="QDialog">
-    <property name="name">
@@ -31 +48 @@
-            <string>You are running this version of FFADO for the first time with this device.
-
-decent usage statistics we would like to send some information about your system to ffado.org. We need usage statistics to convince vendors that Linux does matter
+usage statistics we would like to send some information about your system to ffado.org. It is very important for us to have good usage statistics. This to convince vendors that Linux users do exist. This is where you as a user can help
-
-is information is intended only for usage monitoring. The only personal information sent is an optional email address. The source code for the registration process can be found in "ffado_registration.py"
+e information collected is intended only for usage monitoring. The email address is optional, and will be used for FFADO related announcements only. If you provide one, please provide a valid one
-        </property>
-        <property name="alignment">

trunk/libffado/support/mixer/ffado_registration.py

@@ -14 +14 @@
-                       vendor_string,
-                       model_string):
-
-
+
+
+
-        self.guid = guid
-        self.vendor_id = vendor_id
@@ -25 +26 @@
-        self.parser = ConfigParser.SafeConfigParser()
-        self.parser.read(self.config_filename)
-ffado_version, 
+self.ffado_version, self.
-        self.email = "(optional)"
-        if self.parser.has_section("history") \