Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xmms/patches/xmms-1.2.10-alsa-as-default.patch

    Contents of /trunk/xmms/patches/xmms-1.2.10-alsa-as-default.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 1042 byte(s) 
    -import
    1 --- xmms-1.2.4/xmms/main.c.audio Mon Nov 20 10:45:10 2000
    2 +++ xmms-1.2.4/xmms/main.c Tue Nov 28 19:39:51 2000
    3 @@ -469,7 +469,7 @@
    4 if (cfg.outputplugin == NULL)
    5 {
    6 #ifdef HAVE_OSS
    7 - cfg.outputplugin = g_strdup_printf("%s/%s/libOSS.so", PLUGIN_DIR, plugin_dir_list[0]);
    8 + cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
    9 #elif defined(sun)
    10 cfg.outputplugin = g_strdup_printf("%s/%s/libSolaris.so", PLUGIN_DIR, plugin_dir_list[0]);
    11 #else
    12 --- xmms-1.2.4/Output/OSS/audio.c.audio Fri Jul 28 20:19:41 2000
    13 +++ xmms-1.2.4/Output/OSS/audio.c Tue Nov 28 19:36:19 2000
    14 @@ -592,7 +592,7 @@
    15 else
    16 device_name = g_strdup(DEV_DSP);
    17 }
    18 - fd = open(device_name, O_WRONLY);
    19 + fd = open(device_name, O_WRONLY|O_NONBLOCK);
    20 if (fd == -1)
    21 {
    22 g_warning("oss_open(): Failed to open audio device (%s): %s",
    23 @@ -600,7 +600,8 @@
    24 g_free(device_name);
    25 return 0;
    26 }
    27 -
    28 + fcntl(fd,F_SETFL,fcntl(fd,F_GETFL) &~ O_NONBLOCK);
    29 +
    30 input.format.xmms = fmt;
    31 input.frequency = rate;
    32 input.channels = nch;