RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-28 22:34:59 +00:00
Code Issues Releases Wiki Activity

Fix OSX build; remove all remaining mpvcore references

Browse Source
This commit is contained in:
11rcombs 2013-12-16 20:35:43 -06:00 committed by wm4
parent 0112143fda
commit ad92c893a0
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -11,7 +11,7 @@
/mpv /mpv
/mpv.app /mpv.app
/version.h /version.h
/mpvcore/input/input_conf.h /input/input_conf.h
/tags /tags
/TAGS /TAGS
/video/out/gl_video_shaders.h /video/out/gl_video_shaders.h
@ -19,7 +19,7 @@
/demux/ebml_defs.c /demux/ebml_defs.c
/demux/ebml_types.h /demux/ebml_types.h
/sub/osd_font.h /sub/osd_font.h
/mpvcore/player/lua/*.inc /player/lua/*.inc
/DOCS/man/*/mpv.1 /DOCS/man/*/mpv.1
/DOCS/man/*/mpv.aux /DOCS/man/*/mpv.aux
/DOCS/man/*/mpv.log /DOCS/man/*/mpv.log

14
DOCS/tech-overview.txt
View File

@ -2,7 +2,7 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it
is possibly or definitely outdated. This file intends to give a big is possibly or definitely outdated. This file intends to give a big
picture of how mpv is structured. picture of how mpv is structured.
mpvcore/player/*.c: player/*.c:
Essentially makes up the player applications, including the main() function Essentially makes up the player applications, including the main() function
and the playback loop. and the playback loop.
@ -83,14 +83,14 @@ talloc.h & talloc.c:
rid of the talloc emulation later and use TA natively. rid of the talloc emulation later and use TA natively.
(See ta/README for details.) (See ta/README for details.)
mpvcore/player/command.c: player/command.c:
This contains the implementation for slave commands and properties. This contains the implementation for slave commands and properties.
Properties are essentially dynamic variables changed by certain commands. Properties are essentially dynamic variables changed by certain commands.
This is basically responsible for all user commands, like initiating This is basically responsible for all user commands, like initiating
seeking, switching tracks, etc. It calls into other player/*.c files, seeking, switching tracks, etc. It calls into other player/*.c files,
where most of the work is done, but also calls other parts of mpv. where most of the work is done, but also calls other parts of mpv.
mpvcore/player/mp_core.h: player/core.h:
Data structures and function prototypes for most of player/*.c. They are Data structures and function prototypes for most of player/*.c. They are
usually not accessed by other parts of mpv for the sake of modularization. usually not accessed by other parts of mpv for the sake of modularization.
@ -98,7 +98,7 @@ mpvcore/player/mp_core.h:
else. This is an ongoing transition, and eventually there should be no else. This is an ongoing transition, and eventually there should be no
global variables anymore. global variables anymore.
mpvcore/options.h, mpvcore/options.c options/options.h, options/options.c
options.h contains the global option struct MPOpts. The option declarations options.h contains the global option struct MPOpts. The option declarations
(option names, types, and MPOpts offsets for the option parser) are in (option names, types, and MPOpts offsets for the option parser) are in
options.c. Most default values for options and MPOpts are in options.c. Most default values for options and MPOpts are in
@ -111,7 +111,7 @@ mpvcore/options.h, mpvcore/options.c
The actual option parser is spread over m_option.c, m_config.c, and The actual option parser is spread over m_option.c, m_config.c, and
parser-mpcmd.c, and uses the option table in options.c. parser-mpcmd.c, and uses the option table in options.c.
mpvcore/input/input.c: input/input.c:
This translates keyboard input comming from libvo and other sources (such This translates keyboard input comming from libvo and other sources (such
as remote control devices like Apple IR or slave mode commands) to the as remote control devices like Apple IR or slave mode commands) to the
key bindings listed in the user's (or the builtin) input.conf and turns key bindings listed in the user's (or the builtin) input.conf and turns
@ -123,7 +123,7 @@ mpvcore/input/input.c:
direction of slave mode communication, mpv to application, consists of direction of slave mode communication, mpv to application, consists of
random mp_msg() calls all over the code in all parts of the player.) random mp_msg() calls all over the code in all parts of the player.)
mpvcore/mp_msg.h: common/msg.h:
All terminal output should go through mp_msg(). All terminal output should go through mp_msg().
stream/*: stream/*:
@ -240,7 +240,7 @@ sub/:
detection as well as timing postprocessing work. (Timing postprocessing detection as well as timing postprocessing work. (Timing postprocessing
removes tiny gaps or overlaps between subtitle events.) removes tiny gaps or overlaps between subtitle events.)
mpvcore/player/timeline/: player/timeline/:
A timeline is the abstraction used by loadfile.c to combine several files A timeline is the abstraction used by loadfile.c to combine several files
into one seemingly linear video. It's mainly used for ordered chapters into one seemingly linear video. It's mainly used for ordered chapters
playback. The high level code to find and load other files containing the playback. The high level code to find and load other files containing the

6
osdep/macosx_application.m
View File

@ -19,9 +19,9 @@
#include <pthread.h> #include <pthread.h>
#include "talloc.h" #include "talloc.h"
#include "mpvcore/mp_msg.h" #include "common/msg.h"
#include "mpvcore/input/input.h" #include "input/input.h"
#include "mpvcore/input/keycodes.h" #include "input/keycodes.h"
#include "osdep/macosx_application_objc.h" #include "osdep/macosx_application_objc.h"
#include "osdep/macosx_compat.h" #include "osdep/macosx_compat.h"

2
osdep/macosx_events.m
View File

@ -26,7 +26,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include "talloc.h" #include "talloc.h"
#include "mpvcore/input/input.h" #include "input/input.h"
// doesn't make much sense, but needed to access keymap functionality // doesn't make much sense, but needed to access keymap functionality
#include "video/out/vo.h" #include "video/out/vo.h"

2
osdep/path-macosx.m
View File

@ -17,7 +17,7 @@
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "mpvcore/path.h" #include "options/path.h"
#include "osdep/path.h" #include "osdep/path.h"
char *mp_get_macosx_bundled_path(const char *file) char *mp_get_macosx_bundled_path(const char *file)

4
video/out/cocoa/view.m
View File

@ -17,8 +17,8 @@
#include <libavutil/common.h> #include <libavutil/common.h>
#include "mpvcore/input/input.h" #include "input/input.h"
#include "mpvcore/input/keycodes.h" #include "input/keycodes.h"
#include "osdep/macosx_compat.h" #include "osdep/macosx_compat.h"
#include "video/out/cocoa_common.h" #include "video/out/cocoa_common.h"

2
video/out/cocoa/window.m
View File

@ -17,7 +17,7 @@
#include <libavutil/common.h> #include <libavutil/common.h>
#include "mpvcore/input/keycodes.h" #include "input/keycodes.h"
#include "osdep/macosx_application.h" #include "osdep/macosx_application.h"
#include "osdep/macosx_events.h" #include "osdep/macosx_events.h"

6
video/out/cocoa_common.m
View File

@ -33,14 +33,14 @@
#include "config.h" #include "config.h"
#include "mpvcore/options.h" #include "options/options.h"
#include "video/out/vo.h" #include "video/out/vo.h"
#include "video/out/aspect.h" #include "video/out/aspect.h"
#include "mpvcore/input/input.h" #include "input/input.h"
#include "talloc.h" #include "talloc.h"
#include "mpvcore/mp_msg.h" #include "common/msg.h"
static void vo_cocoa_fullscreen(struct vo *vo); static void vo_cocoa_fullscreen(struct vo *vo);
static void vo_cocoa_ontop(struct vo *vo); static void vo_cocoa_ontop(struct vo *vo);