Mercurial > mplayer.hg
annotate vidix/sis_bridge.h @ 33307:552f1f7731c8
Set GUI initialization flag earlier.
So far, the flag is set after the call of guiInit(), but there are calls
to GUI functions (like reading the GUI config) before that. As MPlayer
(when exiting) only calls GUI's cleanup function guiDone() if the flag
is set, it neglects calling guiDone() on any error between the first GUI
function call and execution of guiInit(). Now the flag is set before the
first GUI function call.
As a result, GUI's own exit function (also used for fatal GUI errors, and
thus also for errors occurring before guiInit() properly finishes) doesn't
have to handle cleanup any longer. The code can be moved to guiDone().
author | ib |
---|---|
date | Sat, 07 May 2011 15:30:14 +0000 |
parents | 36818ea5ce95 |
children |
rev | line source |
---|---|
30551
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
1 /* |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
2 * VIDIX - VIDeo Interface for *niX. |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
3 * |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
4 * This file is part of MPlayer. |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
5 * |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
6 * MPlayer is free software; you can redistribute it and/or modify |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
9 * (at your option) any later version. |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
10 * |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
11 * MPlayer is distributed in the hope that it will be useful, |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
15 * |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License along |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
19 */ |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
20 |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
21 #ifndef MPLAYER_SIS_BRIDGE_H |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
22 #define MPLAYER_SIS_BRIDGE_H |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
23 |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
24 void sis_init_video_bridge(void); |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
25 |
36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
diego
parents:
diff
changeset
|
26 #endif /* MPLAYER_SIS_BRIDGE_H */ |