comparison gui/mplayer/play.c @ 32893:c873777e957d

Get rid of needless listItems variable and pointer. The tmpList structure variable was only used to check whether a skin can be read without error. After the check tmpList was erased and the same skin read once again into another structure - the appropriate target structure. Now error checking is done with skin reading into the target structure. The separate skinAppMPlayer pointer was needless, because a skin will only be read into the one global listItems structure appMPlayer, so that its address can be used right away. Freeing the listItems was done twice before and is now performed at a single place, where the fonts are freed now as well - in skinRead() right before skin reading starts. As a result there is now only one listItems variable - the global appMPlayer; memory is saved, passing around global variables and pointless double actions are avoided.

32892:b5f21d533644

    rel_seek_secs = 0.01 * s;   // 0.0..100.0
    abs_seek_pos  = 3;
}

listItems tmpList;

void ChangeSkin(char *name)
{
    int prev, bprev, ret;

    prev  = appMPlayer.menuIsPresent;
    bprev = appMPlayer.barIsPresent;

    mainVisible = 0;

    appInitStruct(&tmpList);
    skinAppMPlayer = &tmpList;
    fntFreeFont();
    ret = skinRead(name);

    appInitStruct(&tmpList);
    skinAppMPlayer = &appMPlayer;
    appInitStruct(&appMPlayer);

    if (ret)
        name = skinName;

    if (skinRead(name)) {
        mainVisible = 1;
        return;
    }

    // reload menu window

    if (prev && appMPlayer.menuIsPresent) {

32893:c873777e957d

    rel_seek_secs = 0.01 * s;   // 0.0..100.0
    abs_seek_pos  = 3;
}

void ChangeSkin(char *name)
{
    int prev, bprev;

    prev  = appMPlayer.menuIsPresent;
    bprev = appMPlayer.barIsPresent;

    mainVisible = 0;

    if (skinRead(name) != 0) {
        if (skinRead(skinName) != 0) {
        mainVisible = 1;
        return;
        }
    }

    // reload menu window

    if (prev && appMPlayer.menuIsPresent) {