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.

1 files changed, 0 insertions, 251 deletions

diff --git a/parser-cfg.c b/parser-cfg.c
deleted file mode 100644
index 8ab403ba45..0000000000
--- a/parser-cfg.c
+++ /dev/null
@@ -1,251 +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.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <assert.h>
-
-#include "osdep/io.h"
-
-#include "parser-cfg.h"
-#include "mp_msg.h"
-#include "m_option.h"
-#include "m_config.h"
-
-/// Maximal include depth.
-#define MAX_RECURSION_DEPTH 8
-
-/// Current include depth.
-static int recursion_depth = 0;
-
-/// Setup the \ref Config from a config file.
-/** \param config The config object.
- *  \param conffile Path to the config file.
- *  \return 1 on sucess, -1 on error, 0 if file not accessible.
- */
-int m_config_parse_config_file(m_config_t *config, const char *conffile)
-{
-#define PRINT_LINENUM   mp_msg(MSGT_CFGPARSER, MSGL_ERR, "%s:%d: ", conffile, line_num)
-#define MAX_LINE_LEN    10000
-#define MAX_OPT_LEN     1000
-#define MAX_PARAM_LEN   1500
-    FILE *fp;
-    char *line;
-    char opt[MAX_OPT_LEN + 1];
-    char param[MAX_PARAM_LEN + 1];
-    char c;             /* for the "" and '' check */
-    int tmp;
-    int line_num = 0;
-    int line_pos;       /* line pos */
-    int opt_pos;        /* opt pos */
-    int param_pos;      /* param pos */
-    int ret = 1;
-    int errors = 0;
-    int prev_mode = config->mode;
-    m_profile_t *profile = NULL;
-
-    mp_msg(MSGT_CFGPARSER, MSGL_V, "Reading config file %s", conffile);
-
-    if (recursion_depth > MAX_RECURSION_DEPTH) {
-        mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-               ": too deep 'include'. check your configfiles\n");
-        ret = -1;
-        goto out;
-    } else
-
-        config->mode = M_CONFIG_FILE;
-
-    if ((line = malloc(MAX_LINE_LEN + 1)) == NULL) {
-        mp_msg(MSGT_CFGPARSER, MSGL_FATAL,
-               "\ncan't get memory for 'line': %s", strerror(errno));
-        ret = -1;
-        goto out;
-    } else
-
-        mp_msg(MSGT_CFGPARSER, MSGL_V, "\n");
-
-    if ((fp = fopen(conffile, "r")) == NULL) {
-        mp_msg(MSGT_CFGPARSER, MSGL_V, ": %s\n", strerror(errno));
-        free(line);
-        ret = 0;
-        goto out;
-    }
-
-    while (fgets(line, MAX_LINE_LEN, fp)) {
-        if (errors >= 16) {
-            mp_msg(MSGT_CFGPARSER, MSGL_FATAL, "too many errors\n");
-            goto out;
-        }
-
-        line_num++;
-        line_pos = 0;
-
-        /* skip whitespaces */
-        while (isspace(line[line_pos]))
-            ++line_pos;
-
-        /* EOL / comment */
-        if (line[line_pos] == '\0' || line[line_pos] == '#')
-            continue;
-
-        /* read option. */
-        for (opt_pos = 0; isprint(line[line_pos]) &&
-             line[line_pos] != ' ' &&
-             line[line_pos] != '#' &&
-             line[line_pos] != '='; /* NOTHING */) {
-            opt[opt_pos++] = line[line_pos++];
-            if (opt_pos >= MAX_OPT_LEN) {
-                PRINT_LINENUM;
-                mp_msg(MSGT_CFGPARSER, MSGL_ERR, "too long option\n");
-                errors++;
-                ret = -1;
-                goto nextline;
-            }
-        }
-        if (opt_pos == 0) {
-            PRINT_LINENUM;
-            mp_msg(MSGT_CFGPARSER, MSGL_ERR, "parse error\n");
-            ret = -1;
-            errors++;
-            continue;
-        }
-        opt[opt_pos] = '\0';
-
-        /* Profile declaration */
-        if (opt_pos > 2 && opt[0] == '[' && opt[opt_pos - 1] == ']') {
-            opt[opt_pos - 1] = '\0';
-            if (strcmp(opt + 1, "default"))
-                profile = m_config_add_profile(config, opt + 1);
-            else
-                profile = NULL;
-            continue;
-        }
-
-        /* skip whitespaces */
-        while (isspace(line[line_pos]))
-            ++line_pos;
-
-        /* check '=' */
-        if (line[line_pos++] != '=') {
-            PRINT_LINENUM;
-            mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                   "option %s needs a parameter\n", opt);
-            ret = -1;
-            errors++;
-            continue;
-        }
-
-        /* whitespaces... */
-        while (isspace(line[line_pos]))
-            ++line_pos;
-
-        /* read the parameter */
-        if (line[line_pos] == '"' || line[line_pos] == '\'') {
-            c = line[line_pos];
-            ++line_pos;
-            for (param_pos = 0; line[line_pos] != c; /* NOTHING */) {
-                param[param_pos++] = line[line_pos++];
-                if (param_pos >= MAX_PARAM_LEN) {
-                    PRINT_LINENUM;
-                    mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                           "option %s has a too long parameter\n", opt);
-                    ret = -1;
-                    errors++;
-                    goto nextline;
-                }
-            }
-            line_pos++;                 /* skip the closing " or ' */
-        } else {
-            for (param_pos = 0; isprint(line[line_pos])
-                     && !isspace(line[line_pos])
-                     && line[line_pos] != '#'; /* NOTHING */) {
-                param[param_pos++] = line[line_pos++];
-                if (param_pos >= MAX_PARAM_LEN) {
-                    PRINT_LINENUM;
-                    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "too long parameter\n");
-                    ret = -1;
-                    errors++;
-                    goto nextline;
-                }
-            }
-        }
-        param[param_pos] = '\0';
-
-        /* did we read a parameter? */
-        if (param_pos == 0) {
-            PRINT_LINENUM;
-            mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                   "option %s needs a parameter\n", opt);
-            ret = -1;
-            errors++;
-            continue;
-        }
-
-        /* now, check if we have some more chars on the line */
-        /* whitespace... */
-        while (isspace(line[line_pos]))
-            ++line_pos;
-
-        /* EOL / comment */
-        if (line[line_pos] != '\0' && line[line_pos] != '#') {
-            PRINT_LINENUM;
-            mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                   "extra characters: %s\n", line + line_pos);
-            ret = -1;
-        }
-
-        if (profile) {
-            if (!strcmp(opt, "profile-desc"))
-                m_profile_set_desc(profile, param), tmp = 1;
-            else
-                tmp = m_config_set_profile_option(config, profile,
-                                                  opt, param);
-        } else
-            tmp = m_config_set_option0(config, opt, param);
-        if (tmp < 0) {
-            PRINT_LINENUM;
-            if (tmp == M_OPT_UNKNOWN) {
-                mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                       "unknown option '%s'\n", opt);
-                continue;
-            }
-            mp_msg(MSGT_CFGPARSER, MSGL_ERR,
-                   "setting option %s='%s' failed\n", opt, param);
-            continue;
-            /* break */
-        }
-nextline:
-        ;
-    }
-
-    free(line);
-    fclose(fp);
-out:
-    config->mode = prev_mode;
-    --recursion_depth;
-    if (ret < 0) {
-        mp_msg(MSGT_CFGPARSER, MSGL_FATAL, "Error loading config file %s.\n",
-               conffile);
-    }
-    return ret;
-}