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.
---
 core/playlist.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 core/playlist.h

(limited to 'core/playlist.h')

diff --git a/core/playlist.h b/core/playlist.h
new file mode 100644
index 0000000000..eb2ef9ed99
--- /dev/null
+++ b/core/playlist.h
@@ -0,0 +1,67 @@
+/*
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MPLAYER_PLAYLIST_H
+#define MPLAYER_PLAYLIST_H
+
+#include <stdbool.h>
+#include "bstr.h"
+
+struct playlist_param {
+    bstr name, value;
+};
+
+struct playlist_entry {
+    struct playlist_entry *prev, *next;
+    struct playlist *pl;
+
+    char *filename;
+
+    struct playlist_param *params;
+    int num_params;
+};
+
+struct playlist {
+    struct playlist_entry *first, *last;
+
+    // This provides some sort of stable iterator. If this entry is removed from
+    // the playlist, current is set to the next element (or NULL), and
+    // current_was_replaced is set to true.
+    struct playlist_entry *current;
+    bool current_was_replaced;
+};
+
+void playlist_entry_add_param(struct playlist_entry *e, bstr name, bstr value);
+void playlist_entry_add_params(struct playlist_entry *e,
+                               struct playlist_param *params,
+                               int params_count);
+
+struct playlist_entry *playlist_entry_new(const char *filename);
+
+void playlist_insert(struct playlist *pl, struct playlist_entry *after,
+                     struct playlist_entry *add);
+void playlist_add(struct playlist *pl, struct playlist_entry *add);
+void playlist_remove(struct playlist *pl, struct playlist_entry *entry);
+void playlist_clear(struct playlist *pl);
+
+void playlist_add_file(struct playlist *pl, const char *filename);
+void playlist_shuffle(struct playlist *pl);
+struct playlist_entry *playlist_get_next(struct playlist *pl, int direction);
+void playlist_add_base_path(struct playlist *pl, bstr base_path);
+void playlist_transfer_entries(struct playlist *pl, struct playlist *source_pl);
+
+#endif
-- 
cgit v1.2.3