comparison gui/ui/actions.c @ 33694:45553d0f65c6

Don't let MPlayer directly call user interface functions. Provide uiEnd() as the new guiGetEvent type guiEndFile. That way, access is possible through the official interface function.

33693:006a2db8bd55

        wsSetBackgroundRGB(&guiApp.subWindow, 0, 0, 0);
    else
        wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
}

void uiEnd(void)
{
    plItem *next;

    if (!uiGotoTheNext && guiInfo.Playing) {
        uiGotoTheNext = 1;
        return;
    }

    if (guiInfo.Playing && (next = gtkSet(gtkGetNextPlItem, 0, NULL)) && (plLastPlayed != next)) {
        plLastPlayed = next;
        guiSetDF(guiInfo.Filename, next->path, next->name);
        guiInfo.StreamType      = STREAMTYPE_FILE;
        guiInfo.FilenameChanged = guiInfo.NewPlay = 1;
        gfree((void **)&guiInfo.AudioFile);
        gfree((void **)&guiInfo.Subtitlename);
    } else {
        if (guiInfo.FilenameChanged || guiInfo.NewPlay)
            return;

        guiInfo.TimeSec       = 0;
        guiInfo.Position      = 0;
        guiInfo.AudioChannels = 0;
        guiInfo.MovieWindow   = True;

#ifdef CONFIG_DVDREAD
        guiInfo.DVD.current_title   = 1;
        guiInfo.DVD.current_chapter = 1;
        guiInfo.DVD.current_angle   = 1;
#endif

        if (!guiApp.subWindow.isFullScreen && gtkShowVideoWindow) {
            wsResizeWindow(&guiApp.subWindow, guiApp.sub.width, guiApp.sub.height);
            wsMoveWindow(&guiApp.subWindow, True, guiApp.sub.x, guiApp.sub.y);
        } else
            wsVisibleWindow(&guiApp.subWindow, wsHideWindow);

        guiGetEvent(guiSetState, (void *)GUI_STOP);
        uiSubRender = 1;
        wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
        wsClearWindow(guiApp.subWindow);
        wsPostRedisplay(&guiApp.subWindow);
    }
}

void uiPlay(void)
{
    if (!guiInfo.Filename ||
        (guiInfo.Filename[0] == 0) ||
        (guiInfo.Playing == GUI_PLAY))

33694:45553d0f65c6

        wsSetBackgroundRGB(&guiApp.subWindow, 0, 0, 0);
    else
        wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
}

void uiPlay(void)
{
    if (!guiInfo.Filename ||
        (guiInfo.Filename[0] == 0) ||
        (guiInfo.Playing == GUI_PLAY))