comparison gui/win32/interface.c @ 33901:d4f80f889106

Cosmetic: Rename guiInfo members. Change Movie into Video.

33900:b2fcff7e2157

                strcpy(guiInfo.Filename, filename);
            break;
        }
        case GUI_SET_AUDIO:
        {
            guiInfo.MovieWindow = (data && !guiInfo.sh_video);
            // NOTE: This type doesn't mean (and never meant) that we have
            // *just* audio, so there probably should be a check before
            // hiding (see gui/interface.c).
            if(IsWindowVisible(mygui->subwindow))
                ShowWindow(mygui->subwindow, SW_HIDE);

            }
            break;
        }
        case GUI_SETUP_VIDEO_WINDOW:
        {
            guiInfo.MovieWidth = vo_dwidth;
            guiInfo.MovieHeight = vo_dheight;

            sub_aspect = (float)guiInfo.MovieWidth/guiInfo.MovieHeight;
            if(WinID != -1)
               update_subwindow();
            break;
        }
        case GUI_SET_STREAM:

        if(IsWindowVisible(mygui->subwindow) && guiInfo.sh_video && guiInfo.Playing)
        {
            ShowWindow(mygui->subwindow, SW_HIDE);
            return 0;
        }
        else if(!guiInfo.MovieWindow)
            return 0;
        else ShowWindow(mygui->subwindow, SW_SHOW);
    }

    /* we've come out of fullscreen at the end of file */
    if((!IsWindowVisible(mygui->subwindow) || IsIconic(mygui->subwindow)) && guiInfo.MovieWindow)
        ShowWindow(mygui->subwindow, SW_SHOWNORMAL);

    /* get our current window coordinates */
    GetWindowRect(mygui->subwindow, &rd);

        rd.bottom = rd.top+desc->base->bitmap[0]->height;
        sub_aspect = (float)(rd.right-rd.left)/(rd.bottom-rd.top);
    }
    else
    {
        rd.right = rd.left+guiInfo.MovieWidth;
        rd.bottom = rd.top+guiInfo.MovieHeight;

        if (movie_aspect > 0.0)       // forced aspect from the cmdline
            sub_aspect = movie_aspect;
    }

33901:d4f80f889106

                strcpy(guiInfo.Filename, filename);
            break;
        }
        case GUI_SET_AUDIO:
        {
            guiInfo.VideoWindow = (data && !guiInfo.sh_video);
            // NOTE: This type doesn't mean (and never meant) that we have
            // *just* audio, so there probably should be a check before
            // hiding (see gui/interface.c).
            if(IsWindowVisible(mygui->subwindow))
                ShowWindow(mygui->subwindow, SW_HIDE);

            }
            break;
        }
        case GUI_SETUP_VIDEO_WINDOW:
        {
            guiInfo.VideoWidth = vo_dwidth;
            guiInfo.VideoHeight = vo_dheight;

            sub_aspect = (float)guiInfo.VideoWidth/guiInfo.VideoHeight;
            if(WinID != -1)
               update_subwindow();
            break;
        }
        case GUI_SET_STREAM:

        if(IsWindowVisible(mygui->subwindow) && guiInfo.sh_video && guiInfo.Playing)
        {
            ShowWindow(mygui->subwindow, SW_HIDE);
            return 0;
        }
        else if(!guiInfo.VideoWindow)
            return 0;
        else ShowWindow(mygui->subwindow, SW_SHOW);
    }

    /* we've come out of fullscreen at the end of file */
    if((!IsWindowVisible(mygui->subwindow) || IsIconic(mygui->subwindow)) && guiInfo.VideoWindow)
        ShowWindow(mygui->subwindow, SW_SHOWNORMAL);

    /* get our current window coordinates */
    GetWindowRect(mygui->subwindow, &rd);

        rd.bottom = rd.top+desc->base->bitmap[0]->height;
        sub_aspect = (float)(rd.right-rd.left)/(rd.bottom-rd.top);
    }
    else
    {
        rd.right = rd.left+guiInfo.VideoWidth;
        rd.bottom = rd.top+guiInfo.VideoHeight;

        if (movie_aspect > 0.0)       // forced aspect from the cmdline
            sub_aspect = movie_aspect;
    }