comparison mplayer.c @ 33476:d068eac6cbf9

Make option '-noidle' working for the GUI. So far, -idle was implicitly a default option to the GUI (although the corresponding option variable was set to the '-noidle' value). Explicitly set option '-idle' in the GUI now, remove the error (both message and exit) that "the -idle option cannot be used with GMPlayer", start the GUI without filename in either mode (idle or noidle) and go to play_next_file only as long as the GUI has something to play (or -idle was given). This allows using option '-noidle' for the GUI which can be used to quit it after it has finished playing.

33475:b1bda1dded08

    }

    if (opt_exit)
        exit_player(EXIT_NONE);

    if (player_idle_mode && use_gui) {
        mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui);
        exit_player_with_rc(EXIT_NONE, 1);
    }

    if (!filename && !player_idle_mode) {
        if (!use_gui) {
            // no file/vcd/dvd -> show HELP:
            mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
            exit_player_with_rc(EXIT_NONE, 0);
        } else
            gui_no_filename = 1;
    }

    /* Display what configure line was used */
    mp_msg(MSGT_CPLAYER, MSGL_V, "Configuration: " CONFIGURATION "\n");

#endif
        mplEnd();
    }
#endif

    if (use_gui || mpctx->playtree_iter != NULL || player_idle_mode) {
        if (!mpctx->playtree_iter)
            filename = NULL;
        mpctx->eof = 0;
        goto play_next_file;
    }

33476:d068eac6cbf9

    }

    if (opt_exit)
        exit_player(EXIT_NONE);

    if (!filename) {
        if (use_gui)
            gui_no_filename = 1;
        else if (!player_idle_mode) {
            // no file/vcd/dvd -> show HELP:
            mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
            exit_player_with_rc(EXIT_NONE, 0);
        }
    }

    /* Display what configure line was used */
    mp_msg(MSGT_CPLAYER, MSGL_V, "Configuration: " CONFIGURATION "\n");

#endif
        mplEnd();
    }
#endif

    if ((use_gui && guiIntfStruct.Playing) || mpctx->playtree_iter != NULL || player_idle_mode) {
        if (!mpctx->playtree_iter)
            filename = NULL;
        mpctx->eof = 0;
        goto play_next_file;
    }