[tuxdroid-svn] r5481 - software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-09-22 12:43:13 +0200 (Tue, 22 Sep 2009)
New Revision: 5481

Modified:
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Wait for Tux Droid ready instead of 'TuxDroid-TTS' sound card.

Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas	2009-09-22 10:19:23 UTC (rev 5480)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas	2009-09-22 10:43:13 UTC (rev 5481)
@@ -330,6 +330,7 @@
   i := timeout * 10;
   while true do
   begin
+
     if getStates(states) then
     begin
       if isSoundOn(states) and isDongleConnected(states) and isRadioConnected(states) then
@@ -355,6 +356,7 @@
 begin
   result := false;
   i := timeout * 10;
+
   while true do
   begin
     for j := 0 to waveOutGetNumDevs - 1 do

Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-22 10:19:23 UTC (rev 5480)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-22 10:43:13 UTC (rev 5481)
@@ -398,7 +398,7 @@
       // Stop server
       stopServer;
       // Wait Audio cards
-      waitForTuxDroidAudioCards(120);
+      waitForTuxDroidReady(120);
       // Restart server
       startWithSplash;
       // Wait for Tux Droid ready