annotate Gui/Makefile @ 22616:09dc129234a0

Matroska seeking fixes If a relative seek forward went past the last index position the Matroska demuxer did not seek to any index position. It did however set the mkv_d->skip_to_timecode variable which meant that the next fill_buffer() call would read from the current position until the target position (probably the end of the file). Fix this by changing the code to seek to the last index position if that is between the current and target positions. Also change backwards relative seek to accept an exactly matching index position (<= vs <) and reorganize the seeking conditionals to allow making the above change without turning the code into a complete mess.
author uau
date Fri, 16 Mar 2007 14:55:41 +0000
parents bdd28b382a43
children 435648b07244
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
1 include ../config.mak
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
2
22528
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 21877
diff changeset
3 LIBNAME_MPLAYER = libgui.a
17396
418f64d01554 Change LIB to LIBNAME to fix compilation.
diego
parents: 17381
diff changeset
4
19998
b1cebdd78625 Do not compile with -DDEBUG by default.
diego
parents: 19493
diff changeset
5 #CFLAGS += -DDEBUG
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
6
21877
ddc54f850d53 Do not add libavutil unconditionally to CFLAGS.
diego
parents: 21872
diff changeset
7 CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
ddc54f850d53 Do not add libavutil unconditionally to CFLAGS.
diego
parents: 21872
diff changeset
8
18913
2dc84d07332c Initial win32 gui release.
vayne
parents: 18483
diff changeset
9 ifeq ($(TARGET_WIN32),yes)
22528
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 21877
diff changeset
10 SRCS_MPLAYER = win32/dialogs.c \
22531
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
11 win32/gui.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
12 win32/interface.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
13 win32/playlist.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
14 win32/preferences.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
15 win32/skinload.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
16 win32/widgetrender.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
17 win32/wincfg.c \
19072
e6f5f7c26166 cosmetics to ease future patching
diego
parents: 19052
diff changeset
18
18913
2dc84d07332c Initial win32 gui release.
vayne
parents: 18483
diff changeset
19 else
22528
8bcff5c7e387 Give more descriptive names to the source and library variables and split
diego
parents: 21877
diff changeset
20 SRCS_MPLAYER = wm/ws.c \
22531
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
21 wm/wsxdnd.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
22 app.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
23 interface.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
24 cfg.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
25 bitmap.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
26 skin/skin.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
27 skin/font.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
28 skin/cut.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
29 mplayer/widgets.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
30 mplayer/play.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
31 mplayer/mw.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
32 mplayer/sw.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
33 mplayer/menu.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
34 mplayer/pb.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
35 mplayer/common.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
36 mplayer/gtk/menu.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
37 mplayer/gtk/mb.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
38 mplayer/gtk/about.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
39 mplayer/gtk/pl.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
40 mplayer/gtk/sb.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
41 mplayer/gtk/fs.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
42 mplayer/gtk/opts.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
43 mplayer/gtk/url.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
44 mplayer/gtk/eq.c \
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
45 mplayer/gtk/common.c \
19072
e6f5f7c26166 cosmetics to ease future patching
diego
parents: 19052
diff changeset
46
18913
2dc84d07332c Initial win32 gui release.
vayne
parents: 18483
diff changeset
47 endif
6625
54cfbaaf161b remove unneded config files
pontscho
parents: 6036
diff changeset
48
21259
92b122592776 Merge common parts of all Makefiles into one file included by all.
diego
parents: 21217
diff changeset
49 include ../mpcommon.mak
1693
d237c5d4b216 GUI version n-1
arpi
parents:
diff changeset
50
21259
92b122592776 Merge common parts of all Makefiles into one file included by all.
diego
parents: 21217
diff changeset
51 clean::
22531
090ec2169aee cosmetics: Fix indentation, reorder some lines for consistency.
diego
parents: 22528
diff changeset
52 rm -f mplayer/*.o mplayer/*~ mplayer/gtk/*.o mplayer/gtk/*~ \
17494
257c8575c5ab Also remove objects in subdirectories.
diego
parents: 17489
diff changeset
53 skin/*.o skin/*~ \
18913
2dc84d07332c Initial win32 gui release.
vayne
parents: 18483
diff changeset
54 wm/*.o wm/*~ \
19493
aa58338824f8 Remove backup files from the win32 subdir as well.
diego
parents: 19420
diff changeset
55 win32/*.o win32/*~ \