Changeset abdf248d404e2fe2ceef86c969b4a7520211ab68

Show
Ignore:
Timestamp:
20/01/03 11:59:29 (6 years ago)
Author:
Christophe Massiot <massiot@videolan.org>
git-committer:
Christophe Massiot <massiot@videolan.org> 1043060369 +0000
git-parent:

[f42c15f09233a013794814c0b613b11cd01918cd]

git-author:
Christophe Massiot <massiot@videolan.org> 1043060369 +0000
Message:

Fixed a dozen bugs regarding mono audio files.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/audio_filter/converter/mpgatofixed32.c

    r305bc15 rabdf248  
    44 ***************************************************************************** 
    55 * Copyright (C) 2001 by Jean-Paul Saman 
    6  * $Id: mpgatofixed32.c,v 1.1 2003/01/15 10:58:47 massiot Exp $ 
     6 * $Id: mpgatofixed32.c,v 1.2 2003/01/20 10:59:29 massiot Exp $ 
    77 * 
    88 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    8787    if ( p_filter->input.i_original_channels != 
    8888         p_filter->output.i_original_channels 
    89           && p_filter->input.i_physical_channels != 
     89          || p_filter->input.i_physical_channels != 
    9090             p_filter->output.i_physical_channels ) 
    9191    { 

  • modules/audio_output/oss.c

    rca28eb2 rabdf248  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2002 VideoLAN 
    5  * $Id: oss.c,v 1.45 2003/01/14 22:44:29 sam Exp $ 
     5 * $Id: oss.c,v 1.46 2003/01/20 10:59:29 massiot Exp $ 
    66 * 
    77 * Authors: Michel Kaempf <maxx@via.ecp.fr> 
    …… 
    218218        val.psz_string = N_("Mono"); 
    219219        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val ); 
     220        if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER ) 
     221        { 
     222            var_Set( p_aout, "audio-device", val ); 
     223        } 
    220224    } 
    221225 

  • src/audio_output/common.c

    r305bc15 rabdf248  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: common.c,v 1.13 2003/01/15 10:58:48 massiot Exp $ 
     5 * $Id: common.c,v 1.14 2003/01/20 10:59:29 massiot Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    172172            return "Dual-mono"; 
    173173        else if ( p_format->i_original_channels == AOUT_CHAN_CENTER ) 
    174             return "Mono"; 
     174            return "Stereo/Mono"; 
    175175        else if ( !(p_format->i_original_channels & AOUT_CHAN_RIGHT) ) 
    176176            return "Stereo/Left"; 

  • src/audio_output/output.c

    r0bf3bda rabdf248  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: output.c,v 1.28 2003/01/04 16:27:49 gbazin Exp $ 
     5 * $Id: output.c,v 1.29 2003/01/20 10:59:29 massiot Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    9090        free( val.psz_string ); 
    9191    } 
    92     else if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER ) 
     92    else if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER 
     93              && (p_aout->output.output.i_original_channels 
     94                   & AOUT_CHAN_PHYSMASK) == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) 
    9395    { 
    9496        /* Mono - create the audio-channels variable. */ 
    …… 
    113115    else if ( p_aout->output.output.i_physical_channels == 
    114116                 (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) 
    115               && p_aout->output.output.i_original_channels == 
    116                  (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) 
     117              && (p_aout->output.output.i_original_channels 
     118                   & AOUT_CHAN_PHYSMASK) == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) ) 
    117119    { 
    118120        /* Stereo - create the audio-channels variable. */