View | Details | Raw Unified | Return to bug 202578 | Differences between
and this patch

Collapse All | Expand All

(-)backends/oss/oss-backend.c (+7 lines)
Lines 40-45 Link Here
40
     * from the sndstat file, but avoid even trying that on systems where this
40
     * from the sndstat file, but avoid even trying that on systems where this
41
     * is not needed and the file is not present */
41
     * is not needed and the file is not present */
42
#define OSS_PATH_SNDSTAT  "/dev/sndstat"
42
#define OSS_PATH_SNDSTAT  "/dev/sndstat"
43
    /* remove SOUND_MIXER_INFO on FreeBSD, use OSS_PATH_SNDSTAT */
44
#undef SOUND_MIXER_INFO
43
#endif
45
#endif
44
46
45
#define OSS_MAX_DEVICES   32
47
#define OSS_MAX_DEVICES   32
Lines 377-382 read_device_label (OssBackend *oss, cons Link Here
377
{
379
{
378
    guint index;
380
    guint index;
379
381
382
    /* default_device setting only in read_device_label_sndstat()
383
     * on FreeBSD use OSS_PATH_SNDSTAT
384
     */
385
380
#ifdef SOUND_MIXER_INFO
386
#ifdef SOUND_MIXER_INFO
381
    do {
387
    do {
382
        struct mixer_info info;
388
        struct mixer_info info;
Lines 430-435 read_device_label_sndstat (OssBackend * Link Here
430
436
431
    while (fgets (line, sizeof (line), fp) != NULL) {
437
    while (fgets (line, sizeof (line), fp) != NULL) {
432
        gchar *p;
438
        gchar *p;
439
        g_strchomp(line); // required for g_str_has_suffix()
433
440
434
        if (g_str_has_prefix (line, prefix) == FALSE)
441
        if (g_str_has_prefix (line, prefix) == FALSE)
435
            continue;
442
            continue;

Return to bug 202578