From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Nov 2012 17:02:04 +0100 Subject: Rename directories, move files (step 1 of 2) (does not compile) Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code. --- mp_osd.h | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 mp_osd.h (limited to 'mp_osd.h') diff --git a/mp_osd.h b/mp_osd.h deleted file mode 100644 index 444b54736c..0000000000 --- a/mp_osd.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_MP_OSD_H -#define MPLAYER_MP_OSD_H - -#define OSD_MSG_TEXT 1 -#define OSD_MSG_SUB_DELAY 2 -#define OSD_MSG_SPEED 3 -#define OSD_MSG_OSD_STATUS 4 -#define OSD_MSG_BAR 5 -#define OSD_MSG_PAUSE 6 -#define OSD_MSG_RADIO_CHANNEL 7 -#define OSD_MSG_TV_CHANNEL 8 -/// Base id for messages generated from the commmand to property bridge. -#define OSD_MSG_PROPERTY 0x100 -#define OSD_MSG_SUB_BASE 0x1000 - -#define MAX_OSD_LEVEL 3 -#define MAX_TERM_OSD_LEVEL 1 -#define OSD_LEVEL_INVISIBLE 4 - -struct MPContext; - -void set_osd_bar(struct MPContext *mpctx, int type,const char* name,double min,double max,double val); -void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...); -void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...); -void rm_osd_msg(struct MPContext *mpctx, int id); - -#endif /* MPLAYER_MP_OSD_H */ -- cgit v1.2.3