1
0
mirror of https://github.com/mpv-player/mpv synced 2025-05-01 15:50:33 +00:00
Commit Graph

1135 Commits

Author SHA1 Message Date
uau
0f6d5e4fd9 Change value used to indicate "unknown audio format" from 0 to -1.
0 collided with a valid format value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:31:04 +00:00
nicodvb
faa4d4ea23 now the OSD shows the value returned by demuxer_get_current_time() rather than sh_video->pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:57:42 +00:00
reimar
74a504f25b ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:41:25 +00:00
eugeni
978061ad27 Move ass_library initialization code to ass_mp.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:26:13 +00:00
eugeni
219d0cfca9 Always initialize and destroy ass_library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 03:23:23 +00:00
uau
4df2014879 Always initialize libass to fix crashes caused by use without initialization.
Library init was only done if ass_enabled was true at program startup.
However there are at least 2 ways how MPlayer can later try to access
the library even if ass_enabled is false at that point:
- per-file options can turn on ass support later
- if the embeddedfonts option is enabled and the file has fonts 
  demux_mkv will call ass_process_font


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 00:23:12 +00:00
eugeni
efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar
3ee22e98d4 Do not forget to clear subtitles when switching files for embedded subtitles.
Fixes bug #409.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 23:45:41 +00:00
ptt
0e3c3727ce applied patch for -endpos, to work without a blit_frame, pointed out by Andrew Savchenko
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 09:32:58 +00:00
rtogni
c844ece6d4 Disable loading of file-specific configuration file from the same
directory as the played file. Add a command-line switch to enable it.
Patch by reimar, manpage patch by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 21:27:15 +00:00
reimar
e6fd2e126e Remove unused ABS define
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 16:31:41 +00:00
reimar
24bdd688d3 10l, used MSGTR_Unknown instead of lang in mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:15:07 +00:00
reimar
1018bf78dc simplify mp_property_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20187 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:10:45 +00:00
reimar
a21817cecd Cosmetics for previous mplayer.c patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20185 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:06:18 +00:00
reimar
ee65f7b7d9 Simplify mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20184 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:03:28 +00:00
ptt
07198ca3ae modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 14:11:39 +00:00
ptt
68613bbee7 added OSD audio switching visualization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 17:25:46 +00:00
ptt
928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
diego
0a612539ea Fix the sound mute switch in the GUI menu by moving the corresponding
piece of GUI code after audio initialization.
patch by Stanislav Maslovski, stanislav.maslovski gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 13:06:55 +00:00
reimar
a32e00516f Fix audio stream switching with demux_mkv:
return value of demuxer_switch_audio is new stream number for
-aid, the index in a_streams array is in demuxer->audio->id instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 11:07:58 +00:00
nicodvb
cf23d6d116 when changing chapter, in the osd print the channel number in a more natural form:
1-based (rather than 0-based)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 10:27:32 +00:00
nicodvb
9910eae2ba show in the osd the number of the button selected by the mouse
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 22:44:19 +00:00
jonas
776787600d Іnitial button value is -1. Only (button>0) is a correct button selection.
Initialized "dvdnav_status_t status" explicitly for clarity.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 21:42:43 +00:00
nicodvb
78992c7fdc report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:25:31 +00:00
nicodvb
2003857aa2 report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19856 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:13:41 +00:00
nicodvb
3cb5c5b62a don't uninit the video_out when using -fixed-vo; patch by Jonas Jermann
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19843 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 17:26:30 +00:00
eugeni
21faec3791 Add repeated screenshot mode to vf_screenshot.
It is triggered by "screenshot 1".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19839 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 13:27:59 +00:00
attila
840a77bd06 * remove extern definitions of functions in .c files
* create new .h files where necessary

todo:
* go trough other files than mplayer.c
* vf_menu_pause_update()
* mp_input_register_options()
* import_playtree_playlist_into_gui()
* import_initial_playtree_into_gui()

For more infos see http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-September/045683.html
( 20060902133225.2cc82aec.attila@kinali.ch on -dev-eng )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19814 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 16:24:23 +00:00
nicodvb
aab523e18b in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 22:40:22 +00:00
nicodvb
0292752ed0 first touch of support for dvdnav menus; the selection is based on the keyboard selection and is completely blind: there's not the slightest visual feedback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19775 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:45:23 +00:00
nicodvb
6462618244 unconditionally include label goto_enable_cache (to be used next by dvdnav)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19773 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:32:06 +00:00
gpoirier
4026edffd8 fix broken term_osd output in update_osd_msg()
Patch by Andrew Savchenko Bircoph A list P ru
Original thread:
03.09.2006 13:22
[MPlayer-dev-eng] [PACTH] mplayer.c: broken term_osd output in	
update_osd_msg()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 11:57:43 +00:00
uau
2ca1aba8b5 Disable rtc timing by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19762 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 02:08:52 +00:00
reimar
acf654cf8f Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19574 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 17:05:18 +00:00
ben
dd0c5220f6 extended slave mode with metadata retrieval commands
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19539 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 09:44:20 +00:00
ben
000c89175c added new helpers to allow easy metadata retrieval and make libmenu use them
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19538 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 23:14:32 +00:00
ben
a1d1ee76ba new option for libmenu that allow display of properties and metadata of currently played stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19535 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 19:22:51 +00:00
eugeni
2ddfdc85b3 Add VFCTRL_DRAW_EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19527 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 22:10:43 +00:00
ben
7764a187e0 added new filter option to menu file browser to only display some files according to extension
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 20:55:49 +00:00
diego
e8f5c06e76 support for disabling/enabling bitmap font support from configure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19491 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 23:19:11 +00:00
nicodvb
b7b319395e demuxer_seek_chapter() returns informations about chapters count and name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:19:00 +00:00
gpoirier
2029141cf3 fix null pointer check in add_subtitles,
patch by Konstantin G. Khlebikov % koct9i A gmail P com %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19474 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 09:28:01 +00:00
nicodvb
7b414c9b28 seek to chapter using newly introduced demux_seek_chapter()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19442 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:52:23 +00:00
eugeni
e3bf2d7343 Add subdata to ass_track conversion for external subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 19:25:46 +00:00
ivo
c13cfd750e fix segfault if an unknown property is requested
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19386 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 16:45:20 +00:00
reimar
f1ee0a4db2 Reintroduce an ugly variant of the -gui/-nogui options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19361 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-08 14:13:51 +00:00
eugeni
1de0c3327d Add matroska chapter seeking capability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
uau
d3d49ba258 Don't crash if audio init fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-05 18:23:10 +00:00
reimar
76cca6cfee Move ID_AUDIO_CODEC printing after codec init again (it didn't get printed otherwise).
Thanks to tomber71 in IRC for reporting the problem.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19320 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 18:40:19 +00:00
ben
49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
uau
681194f99e Set user_muted in mp_property_mute(). Fixes mute turning off when
seeking.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19232 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 23:17:45 +00:00
uau
3011ebe4d1 cosmetics: fix incorrect indentation left by reimar and extra word in
comment


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19221 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 16:33:27 +00:00
uau
f39495a91b Remove code that prevented the OSD current time from going back by one
second from the previously shown value. If this was needed for something
there should be a better way to do it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19214 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 13:59:50 +00:00
reimar
0d39e76b1e demuxer might not set i_bps, so do not divide by it in that case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-26 18:52:33 +00:00
reynaldo
15e8c12de2 marks several strings inside structs as const when they hold just
read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c 
to cope which the changes.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-16 01:40:24 +00:00
reynaldo
58ed2c3fe0 marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-15 16:03:12 +00:00
reynaldo
1a16cbfec3 marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
uau
072aca08b3 Fix = vs == typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19022 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 10:37:11 +00:00
rfelker
ee588c6ac7 1000000000l to whoever added c++ decl crap, probably uau..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18988 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 02:41:06 +00:00
reimar
eed96ed0e7 No point in checking for X for windows gui, in addition the hackish
way via vo_init breaks vo_gl and vo_gl2 WinID support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 13:59:17 +00:00
reimar
d121c0061b Change use_gui detection to accept also filenames only containing
gmplayer, like "gmplayer.exe", "gmplayer_old" etc.
Also removes (somewhat broken) WIN32 special-case


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18944 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 11:03:18 +00:00
eugeni
1b51da21f5 Indentation fix (cosmetics).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18943 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:27:58 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
eugeni
512eb68dc1 Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:02:49 +00:00
reimar
3b1b7689f2 Remove windows-specific hack that interfered with relative path
handling and should not be needed anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18934 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 11:20:06 +00:00
uau
e2727ec797 Add a new video pts tracking mode, enabled by option -correct-pts.
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
  demuxers.
- Video filters can modify frame timestamps and insert new frames, and
  removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.

Things should work as before when the -correct-pts option is not used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
vayne
c5cf04f543 Initial win32 gui release.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 01:51:31 +00:00
reynaldo
d2e67a69fb Modifies behavior of -edlout
Now it creates a new file and writes edit decision list (EDL) records to it
just as it did before but instead of making pas-2-seconds blocks for each
'i' keystroke  lets the user hits 'i' to mark the start or end of a block.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-05 22:47:44 +00:00
nicodvb
405a7e52e3 support for audio streams that appear after unsuccessful probing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18902 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-04 20:40:18 +00:00
reynaldo
a8e3cea4b3 parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 23:18:06 +00:00
reynaldo
4f593b3393 more sizeof(char) fun
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18861 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 04:09:29 +00:00
ben
5c6bf0cfe7 switch_ratio -1 slave command restores aspect ratio to default value (geexbox patch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18822 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-25 21:16:52 +00:00
uau
c22ccbb864 Revert Michael's VFCTRL_FLIP_PAGE changes ("svn merge -r 18781:18779 .")
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18782 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 23:50:23 +00:00
michael
5dc55f21c1 send flip_page() through the filter chain
ignoring the filter chain cannot and does not work with frame skip / insertion filters
if this breaks something then just reverse it, ive not exhaustively tested it ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 20:29:45 +00:00
uau
bd4a9d25bf Rewrite audio EOF handling logic fixing some problems that could cause
truncation of output, set flag AOPLAY_FINAL_CHUNK in play call to tell
ao there will be no more data beyond what's in current buffer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18738 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 21:52:25 +00:00
uau
ab93c42241 Fix definition of reinit_audio_chain().
It had return type "int" even though it did not return a value (callers
do not expect one) and used old-style syntax. Changed return type to 
"void" and added "void" as parameter list.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18736 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 20:21:37 +00:00
nicodvb
8e500b6d30 removed old dvdnav code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18735 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 19:06:00 +00:00
nicodvb
f1871d5766 restored support for dvdnav only in the stream layer; all other functionalities are disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18715 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 21:58:17 +00:00
uau
900e74381f When playing an audio only file use audio time instead of video time to
set EDL mark. Fixes a NULL pointer dereference.
Problem noticed by Robert Henney, robh A rut org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18714 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 20:20:28 +00:00
uau
6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
nicodvb
2831b49bb5 include stream_dvd's interface from libmpdemux/stream_dvd.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18685 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:29:00 +00:00
nicodvb
8cb1b33222 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18682 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:16:12 +00:00
diego
0e31d5637c Unconditionally compile Matroska demuxer - oops, part missed in initial commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18407 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-09 07:17:19 +00:00
uau
8e4e1ffb74 Don't blit frame if we hit EOF and no new frame is read. Fixes picture
changing back to a previous frame after the last one with some vos.
Patch by Timothy Lee, timothy (.) lee () siriushk com  [location of the
added line changed by me].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-05 17:30:52 +00:00
uau
cc7550e89d Remove a useless variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18324 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 22:13:59 +00:00
diego
a2fdc1955c spelling/grammar/wording fixes in doxygen and non-doxygen comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18317 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 13:22:23 +00:00
uau
9e6de98c11 Remove useless "#if 0" blocks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18316 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 13:16:40 +00:00
uau
8f30963c37 Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 12:40:29 +00:00
uau
c843190441 Change common pts variables from floats to doubles. Individual demuxers
should be changed later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 11:13:21 +00:00
uau
729d2a3827 The code setting the OSD seek direction indicator for absolute seeks was
nonsense. Fix the to-timestamp case. I don't care enough to fix the
to-percentage case so just add a comment noting it's broken.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18289 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 22:34:40 +00:00
uau
bee52bbd10 Remove updating of vo_mouse_timer_const from the main loop and also
remove the variable itself. Convert code in x11_common.c and OSD timing
that depended on the variable to use real time instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 21:36:02 +00:00
nicodvb
ef6264e56e simplified management of dvb channel switching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 20:32:46 +00:00
albeu
ff9f70ad71 Doxygen attack! - Chapter 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18262 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 21:33:50 +00:00
rtognimp
82ee3f8271 5 - Drop more buffered audio data left from old position when seeking.
Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18244 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 11:00:20 +00:00
rtognimp
6c4d9bfe51 4 - Implement a better way to calculate current audio pts and use it for
audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:58:40 +00:00
rtognimp
1d62695562 1 - Remove kernel HZ=100 assumptions that are no longer true from
timing.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18241 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:26:19 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
diego
98aee4cb65 Remove support for default.sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 23:26:12 +00:00
diego
55ca108b4c Kill an unused variable warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18232 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 23:14:58 +00:00
albeu
44e9960dd0 Add properties to get/set the stream position and get the stream
start pos, end pos and length. Based on Reimar's patch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18227 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 15:39:51 +00:00
albeu
7c3d8688c7 Align osd_show_text with osd_show_property_text.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18224 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 14:48:15 +00:00
albeu
116ca0c768 Add a new command: osd_show_property_text that show an expanded property
string on the OSD. Based on a patch 'by someone named "veal" on irc'
that showed the filename.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 14:31:54 +00:00
albeu
63c70fadf2 Handle the tv color control commands with the properties.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18207 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 19:29:02 +00:00
albeu
979532f2c6 Add properties for the tv input color controls.
Make the "normal" color controls fallback on the tv ones
if not available from vf/vo.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18191 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 14:30:22 +00:00
reimar
11ff3f51fb add a newline before the "Playing"... line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18152 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-19 21:06:12 +00:00
corey
6867264ec4 Include buffered decoded audio in A-V sync calculations.
Patch by Uoti Urpala, uoti<<dot>>urpala<<at>>pp1<<dot>>inet<<dot>>fi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-17 16:31:42 +00:00
reimar
480c621a2b do not try to load default.sub when it doesn't exist. Fixes bug #480.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18100 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-15 09:36:53 +00:00
reimar
87fe226acb fix A-V sync overcorrection for desync due to too slow hardware.
Patch by Uoti Urpala ( uoti urpala at pp1 inet fi )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18089 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 10:57:41 +00:00
reimar
105d22e6ff sh_audio->delay is adjusted in the wrong direction when changing audio_delay
at runtime (taking esp. long to recover with large -autosync).
Patch by Uoti Urpala [uoti urpala at pp1 inet fi]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18048 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 12:12:08 +00:00
rfelker
e5782cf37b more cruft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18004 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:47:03 +00:00
rfelker
f93707e51a arrg more of this stupid cruft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18003 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:44:35 +00:00
albeu
03d71f6817 Fix stepping in the playtree when interupting libmpdemux.
Thanks to Jonas Jermann for the report.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17980 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 18:33:23 +00:00
albeu
64b3deff24 Get rid of 2 osd related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 20:42:23 +00:00
albeu
00bc2d2732 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
sub_alignment and sub_forced_only to properties.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 19:32:23 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
albeu
8b5c1be40d Fix osd_show_msg alignment and make sure msg strings
get properly 0 terminated. Thanks to Jonas Jermann
(jjermann _At_ gmx _Dot_ net) for the report.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-23 15:17:23 +00:00
albeu
efb50daf6e Convert fullscreen, panscan, color controls, ontop, rootwin,
border, framedrop and vsync to properties. Also add a couple
of video related properties like width, height, etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17929 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-23 01:22:43 +00:00
albeu
e978b9f5a9 Move audio_delay to a property and add a few read only properties to
query samplerate, format, etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17926 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 23:05:13 +00:00
albeu
0fd651ff1a Add an option to list the properties: -list-properties
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17915 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 16:35:17 +00:00
albeu
7ccf483026 Add the new property API and implement a couple properties.
Move the volume and mute command to the command to property
bridge.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17912 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 00:19:02 +00:00
michael
87323740ed feed something (hopefully correct timestamps) into the video filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 23:09:52 +00:00
diego
30bb277532 Print the mute state on the OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-18 18:48:14 +00:00
albeu
f440a3c1bf Enable gui key bindings only when running the gui. Fix enter and esc
not working with a GUI enabled build running w/o GUI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17891 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-18 18:13:22 +00:00
nicodvb
41d2f9a704 restored the ability to disable subtitles when cycling with slave command 'sub_select' (previously broken in release 1.900)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17733 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-05 08:55:08 +00:00
nicodvb
653243a582 don't fall back to MP_CMD_TV_LAST_CHANNEL after MP_CMD_DVB_SETCHANNEL; patch by calking a ieee d org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-02 21:19:57 +00:00
corey
6f446f41b5 New option: -ignore-start
Makes mplayer and mencoder ignore dwStart in AVI files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-20 09:36:10 +00:00
corey
b4e5108496 dwStart support for mplayer.
* demux_avi sets stream_delay according to dwStart
* mplayer adjusts audio_delay according to stream_delay

3 related patches are pending, and I will apply them over the next few
days if all goes well.

As I mentioned on -dev-eng, the funny indentation is in preparation for
one of those pending patches.

See:
Date: Fri, 17 Feb 2006 00:53:28 -0800
To: mplayer-dev-eng@mplayerhq.hu
Subject: [PATCH] bframes, dwStart: individual patches


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-18 09:26:39 +00:00
corey
1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
corey
3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
corey
15debd85d2 1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
nicodvb
cb832df90c dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17380 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-13 20:06:59 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
henry
757387a4fc fix premature end of audio playback (audio only)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17342 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-08 10:18:18 +00:00
gpoirier
a68b16aec1 Update copyright date to 2006
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 15:28:02 +00:00
nicodvb
db69d933c1 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-02 20:40:25 +00:00
henry
e512aef61b check the intermediate audio buffer
otherwise, data can get stuck between the demuxer and filter layer
causing a premature end of audio.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17275 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-31 07:37:37 +00:00
ods15
eaee93051a change erase to end of line, fall back to old behavior if no termcap found
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17259 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-29 11:27:22 +00:00
ods15
8153d3c643 Fix erase to end of line with windows, windows terminal does not support
control codes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17252 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-27 10:42:02 +00:00
ods15
3c3d7c2039 add "pausing_keep" and "pausing_toggle" input cmd prefixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17242 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-25 19:22:48 +00:00
ods15
95db0aeb23 Use termcap "erase to end of line" character code instead of using spaces
to end of screen.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17241 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-25 18:26:35 +00:00
ods15
5cba0a4078 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 05:12:07 +00:00
ods15
0fe5fb1e00 Fix EDL to be per file, allow -edlout and -edl together as there is really
no reason not to.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17110 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:52:18 +00:00
ods15
5aac28ec24 new -msglevel option, constrols msg level for every msg module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:42:48 +00:00
rathann
d537007fb3 mplayer.c:1928: warning: implicit declaration of function 'cache_uninit'
mplayer.c:2897: warning: implicit declaration of function 'mpcodecs_config_vo'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17089 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:18:10 +00:00
albeu
575dc26398 Add a function to remove osd msg and use it to remove the "OSD: enabled"
msg when switching the OSD to a level above 1.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17058 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-27 23:29:33 +00:00
albeu
364ebd2a6f Make the osd command only switch between enabled/disabled when
using the term osd.
Also put a define to test for the term osd without #ifdef.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17022 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-20 23:44:46 +00:00
albeu
f99cc19968 Big OSD cleanup. Replace the mess with 100's of counter vars
with a clean and simple interface.
As a bonus osd messages can now be displayed on the console if there
is no vo (or osd is disabled in libvo).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16993 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-16 16:51:48 +00:00
joey
8901ee0b0a add a switch, slave command, and vo control to toggle borderless window.
includes documentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16969 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-10 22:25:54 +00:00
ptt
d44e5c8765 reordered subtitles language OSD display, since it worked bad for ogm...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16956 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-09 23:18:38 +00:00