changeset 573:1911fc597c69

Set a WM caption, which the PulseAudio target can use for display purposes.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 24 Jan 2010 14:01:39 -0500
parents 7815c90ba552
children 8d62447b75f2
files playsound/playsound.c
diffstat 1 files changed, 49 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/playsound/playsound.c	Sun Jan 24 13:45:18 2010 -0500
+++ b/playsound/playsound.c	Sun Jan 24 14:01:39 2010 -0500
@@ -719,6 +719,40 @@
 } /* valid_cmdline */
 
 
+static void report_filename(const char *filename)
+{
+    const char *icon = "playsound";
+    size_t len = 0;
+    char *buf = NULL;
+    char *ptr = NULL;
+
+    fprintf(stdout, "%s: Now playing [%s]...\n", icon, filename);
+
+    /*
+     * Bleeding edge versions of SDL 1.2 can use this to set the
+     *  PulseAudio application name. It's a harmless no-op elsewhere,
+     *  and 1.3 will probably have a formal API for this.
+     */
+    ptr = strrchr(filename, '/');
+    if (ptr != NULL)
+        filename = ptr + 1;
+    ptr = strrchr(filename, '\\');
+    if (ptr != NULL)
+        filename = ptr + 1;
+
+    len = strlen(filename) + strlen(icon) + 3;
+    buf = (char *) malloc(len);
+    if (buf == NULL)
+        SDL_WM_SetCaption(icon, icon);
+    else
+    {
+        snprintf(buf, len, "%s: %s", icon, filename);
+        SDL_WM_SetCaption(buf, icon);
+        free(buf);
+    } /* else */
+} /* report_filename */
+
+
 int main(int argc, char **argv)
 {
     Sound_AudioInfo sound_desired;
@@ -981,6 +1015,21 @@
         sdl_desired.callback = audio_callback;
         sdl_desired.userdata = sample;
 
+        /* grr, SDL_CloseAudio() calls SDL_QuitSubSystem internally. */
+        if (!SDL_WasInit(SDL_INIT_AUDIO))
+        {
+            if (SDL_Init(SDL_INIT_AUDIO) == -1)
+            {
+                fprintf(stderr, "SDL_Init() failed!\n"
+                                "  reason: [%s].\n", SDL_GetError());
+                Sound_Quit();
+                SDL_Quit();
+                return(42);
+            } /* if */
+        } /* if */
+
+        report_filename(filename);
+
         if (SDL_OpenAudio(&sdl_desired, NULL) < 0)
         {
             fprintf(stderr, "Couldn't open audio device!\n"
@@ -990,8 +1039,6 @@
             return(42);
         } /* if */
 
-        fprintf(stdout, "Now playing [%s]...\n", filename);
-
         if (global_state.predecode)
         {
             fprintf(stdout, "  predecoding...");