Mercurial > mplayer.hg
annotate stream/stream_dvd.h @ 33526:140525bcc32f
Fix GUI icon bug.
The GUI icon did not display properly but showed up with various distortions.
The reason was the icon mask which hadn't been put to the X server yet when
used.
The icon itself was okay, but is rendered now in a way that doesn't need a
drawable which spares creating a GTK window and destroying it right after.
The locally used GDK variables have been moved inside the function where
they are needed.
Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu.
This closes Bugzilla #582.
author | ib |
---|---|
date | Tue, 14 Jun 2011 17:51:17 +0000 |
parents | c52e80f24086 |
children | e4de3e6665ae |
rev | line source |
---|---|
30426
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
1 /* |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
2 * This file is part of MPlayer. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
3 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
7 * (at your option) any later version. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
8 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
12 * GNU General Public License for more details. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
13 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
17 */ |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
28245
diff
changeset
|
18 |
26029 | 19 #ifndef MPLAYER_STREAM_DVD_H |
20 #define MPLAYER_STREAM_DVD_H | |
25553
6ac1ece1f9fe
Add multiple inclusion guards to all header files that lack them.
diego
parents:
25112
diff
changeset
|
21 |
27043 | 22 #include "config.h" |
26184
7ee4ae1648e6
Add missing header #includes to fix 'make checkheaders'.
diego
parents:
26029
diff
changeset
|
23 #include <stdint.h> |
27466
ea01824701a5
Rename internal libdvdread fork from dvdread to libdvdread
rathann
parents:
27341
diff
changeset
|
24 #include <dvdread/dvd_reader.h> |
ea01824701a5
Rename internal libdvdread fork from dvdread to libdvdread
rathann
parents:
27341
diff
changeset
|
25 #include <dvdread/ifo_types.h> |
ea01824701a5
Rename internal libdvdread fork from dvdread to libdvdread
rathann
parents:
27341
diff
changeset
|
26 #include <dvdread/ifo_read.h> |
ea01824701a5
Rename internal libdvdread fork from dvdread to libdvdread
rathann
parents:
27341
diff
changeset
|
27 #include <dvdread/nav_read.h> |
26184
7ee4ae1648e6
Add missing header #includes to fix 'make checkheaders'.
diego
parents:
26029
diff
changeset
|
28 #include "stream.h" |
30615
01c447d8cc30
Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it.
diego
parents:
30426
diff
changeset
|
29 #include "m_option.h" |
18681 | 30 |
31 typedef struct { | |
32 dvd_reader_t *dvd; | |
33 dvd_file_t *title; | |
34 ifo_handle_t *vmg_file; | |
35 tt_srpt_t *tt_srpt; | |
36 ifo_handle_t *vts_file; | |
37 vts_ptt_srpt_t *vts_ptt_srpt; | |
38 pgc_t *cur_pgc; | |
39 // | |
40 int cur_title; | |
41 int cur_cell; | |
42 int last_cell; | |
43 int cur_pack; | |
44 int cell_last_pack; | |
20746
a40246d0c941
implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME (precise seeking)
nicodvb
parents:
20635
diff
changeset
|
45 int cur_pgc_idx; |
18681 | 46 // Navi: |
47 int packs_left; | |
48 dsi_t dsi_pack; | |
49 int angle_seek; | |
20746
a40246d0c941
implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME (precise seeking)
nicodvb
parents:
20635
diff
changeset
|
50 unsigned int *cell_times_table; |
18681 | 51 // audio datas |
52 int nr_of_channels; | |
53 stream_language_t audio_streams[32]; | |
54 // subtitles | |
55 int nr_of_subtitles; | |
56 stream_language_t subtitles[32]; | |
57 } dvd_priv_t; | |
58 | |
59 int dvd_number_of_subs(stream_t *stream); | |
20156 | 60 int dvd_lang_from_aid(stream_t *stream, int id); |
18681 | 61 int dvd_lang_from_sid(stream_t *stream, int id); |
31876
c52e80f24086
Add const qualifiers to function string arguments as appropriate.
reimar
parents:
30615
diff
changeset
|
62 int dvd_aid_from_lang(stream_t *stream, const unsigned char* lang); |
c52e80f24086
Add const qualifiers to function string arguments as appropriate.
reimar
parents:
30615
diff
changeset
|
63 int dvd_sid_from_lang(stream_t *stream, const unsigned char* lang); |
18681 | 64 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); |
30615
01c447d8cc30
Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it.
diego
parents:
30426
diff
changeset
|
65 int dvd_parse_chapter_range(const m_option_t *conf, const char *range); |
25553
6ac1ece1f9fe
Add multiple inclusion guards to all header files that lack them.
diego
parents:
25112
diff
changeset
|
66 |
26029 | 67 #endif /* MPLAYER_STREAM_DVD_H */ |