summaryrefslogtreecommitdiffstats
path: root/subopt-helper.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 17:02:04 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:06:14 +0100
commitd4bdd0473d6f43132257c9fb3848d829755167a3 (patch)
tree8021c2f7da1841393c8c832105e20cd527826d6c /subopt-helper.h
parentbd48deba77bd5582c5829d6fe73a7d2571088aba (diff)
downloadmpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2
mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz
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.
Diffstat (limited to 'subopt-helper.h')
-rw-r--r--subopt-helper.h64
1 files changed, 0 insertions, 64 deletions
diff --git a/subopt-helper.h b/subopt-helper.h
deleted file mode 100644
index e234db4ed2..0000000000
--- a/subopt-helper.h
+++ /dev/null
@@ -1,64 +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_SUBOPT_HELPER_H
-#define MPLAYER_SUBOPT_HELPER_H
-
-/**
- * \file subopt-helper.h
- *
- * \brief Datatype and functions declarations for usage
- * of the suboption parser.
- *
- */
-
-#define OPT_ARG_BOOL 0
-#define OPT_ARG_INT 1
-#define OPT_ARG_STR 2
-#define OPT_ARG_MSTRZ 3 ///< A malloced, zero terminated string, use free()!
-#define OPT_ARG_FLOAT 4
-
-typedef int (*opt_test_f)(void *);
-
-/** simple structure for defining the option name, type and storage location */
-typedef struct opt_s
-{
- const char * name; ///< string that identifies the option
- int type; ///< option type as defined in subopt-helper.h
- void * valp; ///< pointer to the mem where the value should be stored
- opt_test_f test; ///< argument test func ( optional )
-} opt_t;
-
-/** parses the string for the options specified in opt */
-int subopt_parse( char const * const str, const opt_t * opts );
-
-
-/*------------------ arg specific types and declaration -------------------*/
-typedef struct strarg_s
-{
- int len; ///< length of the string determined by the parser
- char const * str; ///< pointer to position inside the parse string
-} strarg_t;
-
-
-int int_non_neg(void *iptr);
-int int_pos(void *iptr);
-
-int strargcmp(strarg_t *arg, const char *str);
-
-#endif /* MPLAYER_SUBOPT_HELPER_H */