comparison mplayer.c @ 19945:15ae9558e41e

Fix audio stream switching with demux_mkv: return value of demuxer_switch_audio is new stream number for -aid, the index in a_streams array is in demuxer->audio->id instead.

19944:44193c0a688f

      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_TIME_POSITION=%.1f\n", pos);
    } break;
    case MP_CMD_SWITCH_AUDIO : {
        int current_id = demuxer->audio->id;
        int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i);
        if(v > -1 && v < MAX_A_STREAMS && v != current_id) {
          sh_audio_t *sh2;
          uninit_player(INITED_AO | INITED_ACODEC);
          sh2 = demuxer->a_streams[v];
          if(sh2) {
            sh2->ds = demuxer->audio;
            sh_audio = sh2;
            reinit_audio_chain();
          }

19945:15ae9558e41e

      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_TIME_POSITION=%.1f\n", pos);
    } break;
    case MP_CMD_SWITCH_AUDIO : {
        int current_id = demuxer->audio->id;
        int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i);
        if(v > -1 && demuxer->audio->id != current_id) {
          sh_audio_t *sh2;
          uninit_player(INITED_AO | INITED_ACODEC);
          sh2 = demuxer->a_streams[demuxer->audio->id];
          if(sh2) {
            sh2->ds = demuxer->audio;
            sh_audio = sh2;
            reinit_audio_chain();
          }