mirror of
https://github.com/mpv-player/mpv
synced 2024-12-29 18:42:09 +00:00
89a17bcda6
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.
96 lines
3.1 KiB
Objective-C
96 lines
3.1 KiB
Objective-C
/*
|
|
* This file is part of mplayer2.
|
|
*
|
|
* mplayer2 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.
|
|
*
|
|
* mplayer2 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 mplayer2; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
#import <ApplicationServices/ApplicationServices.h>
|
|
#include <stdio.h>
|
|
#include "talloc.h"
|
|
#include "playlist.h"
|
|
#include "macosx_finder_args.h"
|
|
|
|
static struct playlist *files = NULL;
|
|
|
|
void macosx_wait_fileopen_events(void);
|
|
void macosx_redirect_output_to_logfile(const char *filename);
|
|
bool psn_matches_current_process(char *psn_arg_to_check);
|
|
|
|
@interface FileOpenDelegate : NSObject
|
|
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames;
|
|
@end
|
|
|
|
@implementation FileOpenDelegate
|
|
- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
|
|
{
|
|
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)
|
|
}
|
|
@end
|
|
|
|
void macosx_wait_fileopen_events()
|
|
{
|
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
NSApp = [NSApplication sharedApplication];
|
|
[NSApp setDelegate: [[[FileOpenDelegate alloc] init] autorelease]];
|
|
[NSApp run]; // block until we recive the fileopen events
|
|
[pool release];
|
|
}
|
|
|
|
void macosx_redirect_output_to_logfile(const char *filename)
|
|
{
|
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
NSString *log_path = [NSHomeDirectory() stringByAppendingPathComponent:
|
|
[@"Library/Logs/" stringByAppendingFormat:@"%s.log", filename]];
|
|
freopen([log_path fileSystemRepresentation], "a", stdout);
|
|
freopen([log_path fileSystemRepresentation], "a", stderr);
|
|
[pool release];
|
|
}
|
|
|
|
bool psn_matches_current_process(char *psn_arg_to_check)
|
|
{
|
|
ProcessSerialNumber psn;
|
|
char psn_arg[5+10+1+10+1];
|
|
|
|
GetCurrentProcess(&psn);
|
|
snprintf(psn_arg, 5+10+1+10+1, "-psn_%u_%u",
|
|
psn.highLongOfPSN, psn.lowLongOfPSN);
|
|
psn_arg[5+10+1+10]=0;
|
|
|
|
return strcmp(psn_arg, psn_arg_to_check) == 0;
|
|
}
|
|
|
|
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])) {
|
|
macosx_redirect_output_to_logfile("mplayer2");
|
|
m_config_set_option0(config, "quiet", NULL, false);
|
|
macosx_wait_fileopen_events();
|
|
}
|
|
|
|
if (files) {
|
|
playlist_transfer_entries(pl_files, files);
|
|
talloc_free(files);
|
|
files = NULL;
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|