From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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.
---
 libmpcodecs/ad.h | 54 ------------------------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 libmpcodecs/ad.h

(limited to 'libmpcodecs/ad.h')

diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h
deleted file mode 100644
index 5396085d04..0000000000
--- a/libmpcodecs/ad.h
+++ /dev/null
@@ -1,54 +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_AD_H
-#define MPLAYER_AD_H
-
-#include "mpc_info.h"
-#include "libmpdemux/stheader.h"
-
-typedef struct mp_codec_info ad_info_t;
-
-/* interface of video decoder drivers */
-typedef struct ad_functions
-{
-    const ad_info_t *info;
-    int (*preinit)(sh_audio_t *sh);
-    int (*init)(sh_audio_t *sh);
-    void (*uninit)(sh_audio_t *sh);
-    int (*control)(sh_audio_t *sh,int cmd,void* arg, ...);
-    int (*decode_audio)(sh_audio_t *sh, unsigned char *buffer, int minlen,
-                        int maxlen);
-} ad_functions_t;
-
-// NULL terminated array of all drivers
-extern const ad_functions_t * const mpcodecs_ad_drivers[];
-
-// fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0;
-#define ADCTRL_RESYNC_STREAM 1   // resync, called after seeking
-
-// fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds);
-#define ADCTRL_SKIP_FRAME 2      // skip block/frame, called while seeking
-
-// fallback if ADCTRL_QUERY_FORMAT not implemented: sh_audio->sample_format
-#define ADCTRL_QUERY_FORMAT 3    // test for availabilty of a format
-
-// fallback: use hw mixer in libao
-#define ADCTRL_SET_VOLUME 4      // not used at the moment
-
-#endif /* MPLAYER_AD_H */
-- 
cgit v1.2.3