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.
---
 defaultopts.c | 77 -----------------------------------------------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 defaultopts.c

(limited to 'defaultopts.c')

diff --git a/defaultopts.c b/defaultopts.c
deleted file mode 100644
index 1d3abf932c..0000000000
--- a/defaultopts.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <stddef.h>
-
-#include "config.h"
-#include "defaultopts.h"
-#include "options.h"
-#include "mixer.h"
-
-void set_default_mplayer_options(struct MPOpts *opts)
-{
-    *opts = (const struct MPOpts){
-        .audio_driver_list = NULL,
-        .video_driver_list = NULL,
-        .fixed_vo = 1,
-        .softvol = SOFTVOL_AUTO,
-        .softvol_max = 200,
-        .ao_buffersize = -1,
-        .vo_wintitle = "mpv - ${media-title}",
-        .monitor_pixel_aspect = 1.0,
-        .vo_panscanrange = 1.0,
-        .cursor_autohide_delay = 1000,
-        .vo_gamma_gamma = 1000,
-        .vo_gamma_brightness = 1000,
-        .vo_gamma_contrast = 1000,
-        .vo_gamma_saturation = 1000,
-        .vo_gamma_hue = 1000,
-        .osd_level = 1,
-        .osd_duration = 1000,
-        .loop_times = -1,
-        .ordered_chapters = 1,
-        .chapter_merge_threshold = 100,
-        .stream_cache_min_percent = 20.0,
-        .stream_cache_seek_min_percent = 50.0,
-        .chapterrange = {-1, -1},
-        .edition_id = -1,
-        .user_correct_pts = -1,
-        .initial_audio_sync = 1,
-        .term_osd = 2,
-        .consolecontrols = 1,
-        .doubleclick_time = 300,
-        .audio_id = -1,
-        .video_id = -1,
-        .sub_id = -1,
-        .sub_visibility = 1,
-        .extension_parsing = 1,
-        .audio_output_channels = 2,
-        .audio_output_format = -1,  // AF_FORMAT_UNKNOWN
-        .playback_speed = 1.,
-        .drc_level = 1.,
-        .movie_aspect = -1.,
-        .flip = -1,
-        .sub_auto = 1,
-#ifdef CONFIG_ASS
-        .ass_enabled = 1,
-#endif
-        .ass_font_scale = 1,
-        .ass_vsfilter_aspect_compat = 1,
-        .ass_style_override = 1,
-        .use_embedded_fonts = 1,
-
-        .lavc_param = {
-            .workaround_bugs = 1, // autodetect
-            .error_concealment = 3,
-        },
-        .input = {
-             .key_fifo_size = 7,
-             .ar_delay = 100,
-             .ar_rate = 8,
-             .use_joystick = 1,
-             .use_lirc = 1,
-             .use_lircc = 1,
-#ifdef CONFIG_APPLE_REMOTE
-             .use_ar = 1,
-#endif
-             .default_bindings = 1,
-         }
-    };
-}
-- 
cgit v1.2.3