clean up canberra code

This commit is contained in:
TingPing 2013-04-27 20:29:28 -03:00
parent bc1169e979
commit 78f9f3f87c
1 changed files with 11 additions and 14 deletions

View File

@ -2243,13 +2243,9 @@ sound_play (const char *file, gboolean quiet)
#ifdef USE_LIBCANBERRA #ifdef USE_LIBCANBERRA
ca_context_create (&con); ca_context_create (&con);
/* TODO: Volume setting? */ /* TODO: Volume setting? */
if (ca_context_play (con, 0, if (ca_context_play (con, 0, CA_PROP_MEDIA_FILENAME, wavfile, NULL) != 0)
CA_PROP_MEDIA_FILENAME, wavfile, NULL) == 0)
{
g_free (wavfile);
return;
}
#endif #endif
{
cmd = g_find_program_in_path ("play"); cmd = g_find_program_in_path ("play");
if (cmd) if (cmd)
@ -2259,6 +2255,7 @@ sound_play (const char *file, gboolean quiet)
g_free (buf); g_free (buf);
g_free (cmd); g_free (cmd);
} }
}
#endif #endif
} }
else else