path: root/osdep
diff options
authorwm4 <wm4@nowhere>2012-07-31 21:33:26 +0200
committerwm4 <wm4@nowhere>2012-07-31 21:33:26 +0200
commit89a17bcda6c166e98861723b8adc9989f2724c34 (patch)
treef89e05ea12d48c92b04c90c5d447521d29db711c /osdep
parent6e020e66e0e454e8c7f1eeb17e85b90262e95386 (diff)
mplayer: turn playtree into a list, and change per-file option handling
Summary: - There is no playtree anymore. It's reduced to a simple list. - Options are now always global. You can still have per-file options, but these are optional and require special syntax. - The slave command pt_step has been removed, and playlist_next and playlist_prev added. (See etc/input.conf changes.) This is a user visible incompatible change, and will break slave-mode applications. - The pt_clear slave command is renamed to playlist_clear. - Playtree entries could have multiple files. This is not the case anymore, and playlist entries have always exactly one entry. Whenever something adds more than one file (like ASX playlists or dvd:// or dvdnav:// on the command line), all files are added as separate playlist entries. Note that some of the changes are quite deep and violent. Expect regressions. The playlist parsing code in particular is of low quality. I didn't try to improve it, and merely spent to least effort necessary to keep it somehow working. (Especially ASX playlist handling.) The playtree code was complicated and bloated. It was also barely used. Most users don't even know that mplayer manages the playlist as tree, or how to use it. The most obscure features was probably specifying a tree on command line (with '{' and '}' to create/close tree nodes). It filled the player code with complexity and confused users with weird slave commands like pt_up. Replace the playtree with a simple flat playlist. Playlist parsers that actually return trees are changed to append all files to the playlist pre-order. It used to be the responsibility of the playtree code to change per-file config options. Now this is done by the player core, and the playlist code is free of such details. Options are not per-file by default anymore. This was a very obscure and complicated feature that confused even experienced users. Consider the following command line: mplayer file1.mkv file2.mkv --no-audio file3.mkv This will disable the audio for file2.mkv only, because options are per-file by default. To make the option affect all files, you're supposed to put it before the first file. This is bad, because normally you don't need per-file options. They are very rarely needed, and the only reasonable use cases I can imagine are use of the encode backend (mplayer encode branch), or for debugging. The normal use case is made harder, and the feature is perceived as bug. Even worse, correct usage is hard to explain for users. Make all options global by default. The position of an option isn't significant anymore (except for options that compensate each other, consider --shuffle --no-shuffle). One other important change is that no options are reset anymore if a new file is started. If you change settings with slave mode commands, they will not be changed by playing a new file. (Exceptions include settings that are too file specific, like audio/subtitle stream selection.) There is still some need for per-file options. Debugging and encoding are use cases that profit from per-file options. Per-file profiles (as well as per-protocol and per-VO/AO options) need the implementation related mechanisms to backup and restore options when the playback file changes. Simplify the save-slot stuff, which is possible because there is no hierarchical play tree anymore. Now there's a simple backup field. Add a way to specify per-file options on command line. Example: mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3 will have the following options per file set: f1.mkv, f4.mkv: -o0 -o3 f2.mkv, f3.mkv: -o0 -o3 -o1 -o2 The options --{ and --} start and end per-file options. All files inside the { } will be affected by the options equally (similar to how global options and multiple files are handled). When playback of a file starts, the per-file options are set according to the command line. When playback ends, the per-file options are restored to the values when playback started.
Diffstat (limited to 'osdep')
2 files changed, 20 insertions, 18 deletions
diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h
index 1f18931712..2920a577ac 100644
--- a/osdep/macosx_finder_args.h
+++ b/osdep/macosx_finder_args.h
@@ -19,9 +19,11 @@
+#include <stdbool.h>
#include "m_config.h"
-#include "playtree.h"
-play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv);
+struct playlist;
+bool *macosx_finder_args(m_config_t *config, struct playlist *files,
+ int argc, char **argv);
diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m
index b006f11a79..00b7ccfb1d 100644
--- a/osdep/macosx_finder_args.m
+++ b/osdep/macosx_finder_args.m
@@ -19,9 +19,11 @@
#import <Cocoa/Cocoa.h>
#import <ApplicationServices/ApplicationServices.h>
#include <stdio.h>
+#include "talloc.h"
+#include "playlist.h"
#include "macosx_finder_args.h"
-static play_tree_t *files = NULL;
+static struct playlist *files = NULL;
void macosx_wait_fileopen_events(void);
void macosx_redirect_output_to_logfile(const char *filename);
@@ -34,19 +36,9 @@ bool psn_matches_current_process(char *psn_arg_to_check);
@implementation FileOpenDelegate
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
- files = play_tree_new();
- play_tree_t *last_entry = nil;
- for (NSString *filename in filenames) {
- play_tree_t *entry = play_tree_new();
- play_tree_add_file(entry, [filename UTF8String]);
- if (last_entry)
- play_tree_append_entry(files, entry);
- else
- play_tree_set_child(files, entry);
- last_entry = entry;
- }
+ files = talloc_zero(NULL, struct playlist);
+ for (NSString *filename in filenames)
+ playlist_add_file(files, [filename UTF8String]);
[NSApp stop:nil]; // stop the runloop (give back control to mplayer2 code)
@@ -83,7 +75,8 @@ bool psn_matches_current_process(char *psn_arg_to_check)
return strcmp(psn_arg, psn_arg_to_check) == 0;
-play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv)
+bool *macosx_finder_args(m_config_t *config, struct playlist *pl_files,
+ int argc, char **argv)
if (argc==2 && psn_matches_current_process(argv[1])) {
@@ -91,5 +84,12 @@ play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv)
- return files;
+ if (files) {
+ playlist_transfer_entries(pl_files, files);
+ talloc_free(files);
+ files = NULL;
+ return true;
+ } else {
+ return false;
+ }