Changeset 184 for trunk/src/helpers/syssound.c

Timestamp:

Jul 5, 2002, 9:13:36 AM (23 years ago)

Author:

umoeller

Message:

Second round of fixes for 0.9.19.

File:

• trunk/src/helpers/syssound.c (modified) (23 diffs)

trunk/src/helpers/syssound.c

@@ -21 +21 @@
  *      These are the general flags in the "MMPM2_AlarmSoundsData"
  *      application:
+ *
  *      --  If "EnableSounds" is FALSE, all system sounds are disabled.
  *          This defaults to TRUE (tested).
+ *
  *      --  If "ApplyVolumeToAll" is TRUE, the same volume is used for
  *          all sounds. This defaults to FALSE (tested).
+ *
  *      --  If ApplyVolumeToAll is TRUE, "Volume" is used for the
  *          global volume. Otherwise, the individual sound volumes
@@ -34 +37 @@
  *
  *      Each sound data block in there consists of three elements:
+ *
  +          soundfile#description#volume
+ *
  *      where "description" is what is listed in the "Sound" object.
  *      "volume" is only used when "ApplyVolumeToAll" (above) is FALSE.
@@ -114 +119 @@
  *
  *@@added V0.9.0 [umoeller]
- */
-
-ULONG sndParseSoundData(PSZ pszSoundData,  // in: INI data from MMPM.INI
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: optimized
+ */
+
+ULONG sndParseSoundData(PCSZ pszSoundData,  // in: INI data from MMPM.INI
                         PSZ pszDescr,    // out: sound description, as displayed
                                // in the "Sound" object (ptr may be NULL)
@@ -124 +130 @@
                                // even if "Global volume" is set in MMPM.INI.
 {
-    PSZ         p1 = pszSoundData, p2;
+    PCSZ        p1 = pszSoundData, p2;
     ULONG       ulrc = 0;
     // get sound file
-    p2 = strchr(p1, '#');
-    if (p2)
+    if (p2 = strchr(p1, '#'))
     {
         ulrc++;
         if (pszFile)
         {
-            strncpy(pszFile, p1, p2-p1);
+            strncpy(pszFile, p1, p2 - p1);
             pszFile[p2-p1] = '\0';
         }
@@ -139 +144 @@
 
         // get sound description
-        p2 = strchr(p1, '#');
-        if (p2)
+        if (p2 = strchr(p1, '#'))
         {
             ulrc++;
@@ -154 +158 @@
             {
                 // individual volume settings per sound
-                sscanf(p1, "%lu", pulVolume);
+                *pulVolume = atoi(p1);      // V0.9.20 (2002-07-03) [umoeller]
+                // sscanf(p1, "%lu", pulVolume);
                 ulrc++;
             }
@@ -160 +165 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -173 +178 @@
 VOID sndQueryMmpmIniPath(PSZ pszMMPM)       // out: fully q'fied MMPM.INI
 {
-    PSZ     pszMMPMPath = getenv("MMBASE"); // V0.9.6 (2000-10-16) [umoeller]
-    if (pszMMPMPath)
+    PSZ pszMMPMPath;
+    if (pszMMPMPath = getenv("MMBASE"))  // V0.9.6 (2000-10-16) [umoeller]
     {
         // variable set:
@@ -182 +187 @@
 
         // kill semicolon if present
-        p = strchr(pszMMPM, ';');
-        if (p)
+        if (p = strchr(pszMMPM, ';'))
            *p = 0;
 
@@ -211 +215 @@
     HAB     habDesktop = WinQueryAnchorBlock(HWND_DESKTOP);
     CHAR    szMMPM[CCHMAXPATH];
-    HINI    hini = NULLHANDLE;
 
     sndQueryMmpmIniPath(szMMPM);
 
-    hini = PrfOpenProfile(habDesktop, szMMPM);
-    return (hini);
+    return PrfOpenProfile(habDesktop, szMMPM);
 }
 
@@ -324 +326 @@
     }
 
-    return (rc);
+    return rc;
 }
 
@@ -345 +347 @@
 BOOL sndWriteSoundData(HINI hiniMMPM,       // in: MMPM.INI handle (from sndOpenMmpmIni)
                        USHORT usIndex,      // in: sound index
-                       PSZ pszDescr,        // in: sound name or NULL for removal
-                       PSZ pszFile,         // in: sound file
+                       PCSZ pszDescr,       // in: sound name or NULL for removal
+                       PCSZ pszFile,        // in: sound file
                        ULONG ulVolume)      // in: sound volume
 {
@@ -359 +361 @@
         sprintf(szData, "%s#%s#%lu", pszFile, pszDescr, ulVolume);
         brc = PrfWriteProfileString(hiniMMPM,
-                                    MMINIKEY_SYSSOUNDS, szKey,
+                                    MMINIKEY_SYSSOUNDS,
+                                    szKey,
                                     szData);
     }
@@ -366 +369 @@
         // delete entry
         brc = PrfWriteProfileString(hiniMMPM,
-                                    MMINIKEY_SYSSOUNDS, szKey,
+                                    MMINIKEY_SYSSOUNDS,
+                                    szKey,
                                     NULL);
 
@@ -396 +400 @@
 BOOL sndSetSystemSound(HAB hab,
                        USHORT usIndex,
-                       PSZ pszDescr,
-                       PSZ pszFile,
+                       PCSZ pszDescr,
+                       PCSZ pszFile,
                        ULONG ulVolume)
 {
     BOOL    brc = FALSE;
-    HINI    hiniMMPM = sndOpenMmpmIni(hab);
-    if (hiniMMPM)
+    HINI    hiniMMPM;
+    if (hiniMMPM = sndOpenMmpmIni(hab))
     {
         brc = sndWriteSoundData(hiniMMPM, usIndex, pszDescr, pszFile, ulVolume);
         PrfCloseProfile(hiniMMPM);
     }
+
     return brc;
 }
@@ -415 +420 @@
  *      in OS2SYS.INI.
  *
+ *      If so, and *ppszRealScheme is != NULL, it
+ *      is set to the key name found. Since the
+ *      scheme names are case-insensitive, this
+ *      check is necessary to delete the original
+ *      scheme for overwrites. The caller is
+ *      responsible for free()ing *ppszRealScheme
+ *      then.
+ *
  *@@added V0.9.0 [umoeller]
- */
-
-BOOL sndDoesSchemeExist(PSZ pszScheme)
-{
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: check has to be case-insensitive, fixed; changed prototype
+ */
+
+BOOL sndDoesSchemeExist(PCSZ pcszScheme,
+                        PSZ *ppszRealScheme)    // out: actual key name (ptr can be NULL)
+{
+    BOOL fExists = FALSE;
+    PSZ pszKeysList;
+    if (!prfhQueryKeysForApp(HINI_SYSTEM,
+                             MMINIKEY_SOUNDSCHEMES,  // "PM_SOUND_SCHEMES_LIST"
+                             &pszKeysList))
+    {
+        PSZ pKey2 = pszKeysList;
+        while (*pKey2)
+        {
+            if (!stricmp(pKey2, pcszScheme))
+            {
+                fExists = TRUE;
+
+                if (ppszRealScheme)
+                    *ppszRealScheme = strdup(pKey2);
+
+                break;
+            }
+
+            pKey2 += strlen(pKey2)+1; // next key
+        }
+
+        free(pszKeysList);
+    }
+
+    return fExists;
+
+    /* old code V0.9.20 (2002-07-03) [umoeller]
     // check in OS2SYS.INI's scheme list whether that
     // scheme exists already
@@ -433 +476 @@
 
     return (FALSE);
+    */
+
 }
 
@@ -453 +498 @@
 
 APIRET sndCreateSoundScheme(HINI hiniMMPM,      // in: MMPM.INI handle (from sndOpenMmpmIni)
-                            PSZ pszNewScheme)   // in: name of new scheme
+                            PCSZ pszNewScheme)  // in: name of new scheme
 {
     APIRET  arc = NO_ERROR;
@@ -489 +534 @@
                 // file name and append the volume...
 
-                PSZ pSoundData = prfhQueryProfileData(hiniMMPM,
+                PSZ pSoundData;
+                if (pSoundData = prfhQueryProfileData(hiniMMPM,
                                                       MMINIKEY_SYSSOUNDS, // "MMPM2_AlarmSounds"
                                                       pKey2,
-                                                      NULL);
-                if (pSoundData)
+                                                      NULL))
                 {
                     sndParseSoundData(pSoundData,
@@ -521 +566 @@
             PrfWriteProfileString(HINI_SYSTEM,
                                   MMINIKEY_SOUNDSCHEMES,  // "PM_SOUND_SCHEMES_LIST"
-                                  pszNewScheme,      // key is scheme name
+                                  (PSZ)pszNewScheme,      // key is scheme name
                                   szNewAppName);    // data is new OS2SYS.INI application
         }
@@ -562 +607 @@
 
 APIRET sndLoadSoundScheme(HINI hiniMMPM,      // in: HINI of ?:\MMOS2\MMPM.INI (PrfOpenProfile)
-                          PSZ pszScheme)      // in: scheme name
+                          PCSZ pszScheme)     // in: scheme name
 {
     APIRET arc = NO_ERROR;
@@ -702 +747 @@
  */
 
-APIRET sndDestroySoundScheme(PSZ pszScheme)
+APIRET sndDestroySoundScheme(PCSZ pszScheme)
 {
     APIRET arc = NO_ERROR;
 
     // check in OS2SYS.INI's scheme list whether that
-    // scheme exists already
-    PSZ pszExisting = prfhQueryProfileData(HINI_SYSTEM,
+    // scheme exists
+    PSZ pszExisting;
+    if (pszExisting = prfhQueryProfileData(HINI_SYSTEM,
                                            MMINIKEY_SOUNDSCHEMES,  // "PM_SOUND_SCHEMES_LIST"
                                            pszScheme,
-                                           NULL);
-    if (pszExisting)
+                                           NULL))
     {
         // delete whole existing PM_SOUNDS_BLAHBLAH application
@@ -722 +767 @@
         PrfWriteProfileString(HINI_SYSTEM,
                               MMINIKEY_SOUNDSCHEMES,  // "PM_SOUND_SCHEMES_LIST"
-                              pszScheme,
+                              (PSZ)pszScheme,
                               NULL);
         free(pszExisting);