Mercurial > mplayer.hg
view gui/win32/gui.h @ 33667:adb10970ec83
Fix bug introduced as a side effect in r33750.
It was no longer possible to start gmplayer from the command line with
a file argument.
Every time gmplayer is called with a file argument this file goes into
the GUI specific playlist. As a side effect, GUI's file(name) to play
and MPlayer's filename point to the same address.
guiInit() pointlessly tries to set GUI's filename (free and strdup) from
MPlayer's filename instead of getting it from its playlist. The previous
memset set GUI's filename to NULL rendering the free() effectless while
now such an operation on the same address to strdup() afterwards isn't a
good idea.
Remove the pointless code.
author | ib |
---|---|
date | Tue, 28 Jun 2011 15:00:05 +0000 |
parents | c89456eb2ea4 |
children | cdd4fc0616b6 |
line wrap: on
line source
/* * MPlayer GUI for Win32 * Copyright (C) 2003 Sascha Sommer <saschasommer@freenet.de> * Copyright (C) 2006 Erik Augustson <erik_27can@yahoo.com> * Copyright (C) 2006 Gianluigi Tiesi <sherpya@netfarm.it> * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MPLAYER_GUI_GUI_H #define MPLAYER_GUI_GUI_H #include "config.h" #include "mplayer.h" #include "playtree.h" #include "m_config.h" #include "skinload.h" #include "playlist.h" extern float sub_aspect; extern play_tree_t* playtree; extern int sub_window; extern int console; extern NOTIFYICONDATA nid; extern char *codecname; typedef struct window_priv_t window_priv_t; struct window_priv_t { HWND hwnd; image img; image *background; HBITMAP bitmap; int type; }; typedef struct gui_t gui_t; struct gui_t { /* screenproperties */ int screenw, screenh, screenbpp; /* window related stuff */ char *classname; HICON icon; unsigned int window_priv_count; window_priv_t **window_priv; HWND mainwindow; HWND subwindow; /* for event handling */ widget *activewidget; int mousewx, mousewy; /* mousepos inside widget */ int mousex, mousey; HMENU menu; HMENU diskmenu; HMENU traymenu; HMENU trayplaymenu; HMENU trayplaybackmenu; HMENU submenu; HMENU subtitlemenu; HMENU aspectmenu; HMENU dvdmenu; HMENU playlistmenu; int skinbrowserwindow; int playlistwindow; int aboutwindow; skin_t *skin; playlist_t *playlist; void (*startplay)(gui_t *gui); void (*updatedisplay)(gui_t *gui, HWND hwnd); void (*playercontrol)(int event); /* userdefine call back function */ void (*uninit)(gui_t *gui); }; #define wsShowWindow 8 #define wsHideWindow 16 #define wsShowFrame 1 #define wsMovable 2 #define wsSizeable 4 gui_t *create_gui(char *skindir, char *skinName, void (*playercontrol)(int event)); int destroy_window(gui_t *gui); int create_window(gui_t *gui, char *skindir); int create_subwindow(gui_t *gui, char *skindir); int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear); void capitalize(char *filename); void renderinfobox(skin_t *skin, window_priv_t *priv); void renderwidget(skin_t *skin, image *dest, widget *item, int state); /* Dialogs */ void display_playlistwindow(gui_t *gui); void update_playlistwindow(void); int display_openfilewindow(gui_t *gui, int add); void display_openurlwindow(gui_t *gui, int add); void display_skinbrowser(gui_t *gui); void display_chapterselwindow(gui_t *gui); void display_eqwindow(gui_t *gui); void display_prefswindow(gui_t *gui); void display_opensubtitlewindow(gui_t *gui); #endif /* MPLAYER_GUI_GUI_H */