comparison gui/interface.c @ 35430:2d55540614a9

Move uiProcessNextInPlaylist to the guiInfo structure. It's an information for GUI control and need not be a separate global variable. Additionally, rename it PlaylistNext to shorten the name.

35429:3a9048421524

#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif

guiInterface_t guiInfo = {
    .StreamType = STREAMTYPE_DUMMY,
    .Balance    = 50.0f
};

static int initialized;

/* MPlayer -> GUI */

        guiInfo.sh_video = NULL;

        uiEventHandling(ivRedraw, 1);

        if (!uiProcessNextInPlaylist && guiInfo.Playing) {
            uiProcessNextInPlaylist = 1;
            break;
        }

        if (guiInfo.StreamType == STREAMTYPE_CDDA) {
            uiNext();

            if (add_to_gui_playlist(filename, PLAYLIST_ITEM_APPEND))
                result = 1;
    }

    uiCurr();   // update filename
    uiProcessNextInPlaylist = 1;

    if (enqueue)
        filename = NULL;            // don't start playing

    if (result)

35430:2d55540614a9

#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif

guiInterface_t guiInfo = {
    .StreamType   = STREAMTYPE_DUMMY,
    .Balance      = 50.0f,
    .PlaylistNext = 1
};

static int initialized;

/* MPlayer -> GUI */

        guiInfo.sh_video = NULL;

        uiEventHandling(ivRedraw, 1);

        if (!guiInfo.PlaylistNext && guiInfo.Playing) {
            guiInfo.PlaylistNext = 1;
            break;
        }

        if (guiInfo.StreamType == STREAMTYPE_CDDA) {
            uiNext();

            if (add_to_gui_playlist(filename, PLAYLIST_ITEM_APPEND))
                result = 1;
    }

    uiCurr();   // update filename
    guiInfo.PlaylistNext = 1;

    if (enqueue)
        filename = NULL;            // don't start playing

    if (result)