summaryrefslogtreecommitdiffstats
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* msg: don't clear term OSD lines that are not usedwm42014-01-141-3/+5
|
* msg: fix printing of module headerwm42014-01-141-1/+2
| | | | | The code to set root->header was moved before the point where it's used, which broke the logic.
* player: redo terminal OSD and status line handlingwm42014-01-132-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The terminal OSD code includes the handling of the terminal status line, showing player OSD messages on the terminal, and showing subtitles on terminal (the latter two only if there is no video window, or if terminal OSD is forced). This didn't handle some corner cases correctly. For example, showing an OSD message on the terminal always cleared the previous line, even if the line was an important message (or even just the command prompt, if most other messages were silenced). Attempt to handle this correctly by keeping track of how many lines the terminal OSD currently consists of. Since there could be race conditions with other messages being printed, implement this in msg.c. Now msg.c expects that MSGL_STATUS messages rewrite the status line, so the caller is forced to use a single mp_msg() call to set the status line. Instead of littering print_status() all over the place, update the status only once per playloop iteration in update_osd_msg(). In audio- only mode, the status line might now be a little bit off, but it's perhaps ok. Print the status line only if it has changed, or if another message was printed. This might help with extremely slow terminals, although in audio+video mode, it'll still be updated very often (A-V sync display changes on every frame). Instead of hardcoding the terminal sequences, use terminfo/termcap to get the sequences. Remove the --term-osd-esc option, which allowed to override the hardcoded escapes - it's useless now. The fallback for terminals with no escape sequences for moving the cursor and clearing a line is removed. This somewhat breaks status line display on these terminals, including the MS Windows console: instead of querying the terminal size and clearing the line manually by padding the output with spaces, the line is simply not cleared. I don't expect this to be a problem on UNIX, and on MS Windows we could emulate escape sequences. Note that terminal OSD (other than the status line) was broken anyway on these terminals. In osd.c, the function get_term_width() is not used anymore, so remove it. To remind us that the MS Windows console apparently adds a line break when writint the last column, adjust screen_width in terminal- win.c accordingly.
* Factor out setting AVCodecContext extradatawm42014-01-112-10/+15
|
* common: drop mp_append_utf8_buffer()wm42013-12-302-13/+2
|
* common: simplify and optimize string escape parsingwm42013-12-302-5/+76
| | | | | | | | | | | This code is shared between input.conf parser and option parser. Until now, the performance didn't really matter. But I want to use this code for JSON parsing too, and since JSON will have to be parsed a lot, it should probably try to avoid realloc'ing too much. This commit moves parsing of C-style escaped strings into a common function, and allows using it in a way realloc can be completely avoided, if the already allocated buffer is large enough.
* asxparser: remove commented codewm42013-12-221-12/+0
|
* Don't include version.h from make options.cwm42013-12-222-4/+4
| | | | | | | | | I find this annoying. It's the reason common/version.c exists at all. options.c did this for the user agent, which contains the version number. Because not including version.h means you can't build the user agent and use it in mp_default_opts anymore, do something rather awkward in main.c to initialize the default user agent.
* msg: add some comments about thread-safetywm42013-12-221-0/+6
|
* msg: remove global statewm42013-12-213-59/+58
|
* msg: don't prefix slave-mode stuff by defaultwm42013-12-211-1/+1
|
* msg: rename mp_msg_log -> mp_msgwm42013-12-216-31/+31
| | | | Same for companion functions.
* msg: convert defines to enumwm42013-12-213-26/+27
| | | | Also get rid of MSGL_HINT and the many MSGL_DBG* levels.
* msg: remove legacy stuffwm42013-12-212-142/+3
|
* cpudetect: remove mp_msg callswm42013-12-211-13/+0
| | | | Worthless anyway.
* stream: mp_msg conversionswm42013-12-212-6/+5
| | | | We also drop some slave mode stuff from stream_vcd.
* demux: mp_msg conversionswm42013-12-211-1/+1
| | | | | | | The TV code pretends to be part of stream/, but it's actually demuxer code too. The audio_in code is shared between the TV code and stream_radio.c, so stream_radio.c needs a small hack until stream.c is converted.
* playlist_parser: mp_msg conversionwm42013-12-214-72/+79
|
* encode_lavc: mp_msg conversionswm42013-12-213-109/+101
| | | | Miss two mp_msg calls, because these conflict with future commits.
* av_log: mp_msg conversionwm42013-12-212-32/+71
| | | | | | | | This is pretty nasty, because FFmpeg/Libav is yet another library with a global message callback. We do something with mutexes trying to get it done, but of course we can't actually solve this problem. If more than one library in a process use FFmpeg/Libav, only one of them will get log messages.
* m_option, m_config: mp_msg conversionswm42013-12-212-14/+16
| | | | | | | | Always pass around mp_log contexts in the option parser code. This of course affects all users of this API as well. In stream.c, pass a mp_null_log, because we can't do it properly yet. This will be fixed later.
* codecs: avoid having to print error messagewm42013-12-211-3/+2
| | | | | | | | | The mp_select_decoders() function doesn't have a log context (and I don't want to give it one), so get rid of the mp_msg error message by enhancing the semantics such that the syntax error is replaced by a new feature. Now doing "--ad=something" will enable all decoders in the "something" module, same as "--ad=something:*". Pretty useless, but gets rid of the annoyance.
* codecs: mp_msg conversionwm42013-12-212-7/+8
|
* av_common: abuse av_log to print message instead of mp_msgwm42013-12-211-1/+2
| | | | Saves a little bit of pain.
* msg: handle vsnprintf errorswm42013-12-201-1/+2
| | | | | | | I don't know under which circumstances this can error (other than a broken format string). It seems it won't return an error code on I/O errors, so maybe broken format strings are the only case. Either way, don't continue if an error is returned.
* msg: use a global lock to synchronize printingwm42013-12-201-4/+7
| | | | | | | | | | | | | | We have certain race conditions coming from doing multiple fprintf() calls (setting up colors etc.). I'm not sure whether it would be worth changing to code such that we do only one fprintf() call (and assume this synchronizes access), but considering it would be hard to do (Windows compatibility, ...), and that stdio uses per FILE locks anyway, this is simpler and probably not less efficient. Also, there's no problem handling the weird statusline special case this way. Note that mp_msg_* calls which are silent won't acquire the lock, and acquiring the lock happens on actual output only (which is slow and serialized anyway).
* msg: change --msglevel, reduce legacy gluewm42013-12-202-26/+123
| | | | | | | | | | | | Basically, reimplement --msglevel. Instead of making the new msg code use the legacy code, make the legacy code use the reimplemented functionality. The handling of the deprecated --identify switch changes. It temporarily stops working; this will be fixed in later commits. The actual sub-options syntax (like --msglevel-vo=...) goes away, but I bet nobody knew about this or used this anyway.
* msg: cosmetic changeswm42013-12-202-124/+87
| | | | | In particular, condense the legacy MSGT_ defines and move them to the end of the file.
* msg: change hack to silence command line pre-parse error messageswm42013-12-202-1/+4
| | | | mp_msg_levels[] will go away.
* terminal: remove separate formatting for --msgmodulewm42013-12-201-4/+1
| | | | Instead, --msgmodule uses the same formatting as -v.
* terminal: abstract terminal color handlingwm42013-12-201-95/+5
| | | | | | | | Instead of making msg.c an ifdef hell for unix vs. windows code, move the code to separate functions defined in terminal-unix.c/terminal- win.c. Drop the code that selects random colors for --msgmodule prefixes.
* terminal: move SIGTTOU signal handler setup codewm42013-12-191-7/+0
| | | | | | This comes with a real change in behavior: now the signal handler is set only when the terminal input code is active (e.g. not with --no-consolecontrols), but this should be ok.
* Rename getch2....c/h to terminal....c/hwm42013-12-191-1/+1
| | | | | "getch2" really tells nothing about what the heck this code does. It'd be even worse when moving the rest of terminal handling code there.
* Reduce recursive config.h inclusions in headerswm42013-12-181-3/+4
| | | | | | In my opinion, config.h inclusions should be kept to a minimum. MPlayer code really liked including config.h everywhere, though, even in often used header files. Try to reduce this.
* Remove the _ macrowm42013-12-182-7/+4
| | | | | This was a gettext-style macro to mark strings that should be translated.
* Split mpvcore/ into common/, misc/, bstr/wm42013-12-1725-0/+4380