mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-25 07:50:53 +00:00
Update NSMovie.m, start cleaning up ffplay.m
This commit is contained in:
parent
cf2a1ca431
commit
c15ea80d09
2 changed files with 9 additions and 5 deletions
|
@ -245,6 +245,7 @@ static inline void _loadNSMoviePlugIns (void)
|
||||||
new->_movie = _movie;
|
new->_movie = _movie;
|
||||||
new->_movieData = [_movieData copyWithZone: zone];
|
new->_movieData = [_movieData copyWithZone: zone];
|
||||||
new->_url = [_url copyWithZone: zone];
|
new->_url = [_url copyWithZone: zone];
|
||||||
|
|
||||||
return new;
|
return new;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,9 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#import <AppKit/NSMovieView.h>
|
||||||
|
#import <AppKit/NSMovie.h>
|
||||||
|
|
||||||
const char program_name[] = "ffplay";
|
const char program_name[] = "ffplay";
|
||||||
const int program_birth_year = 2003;
|
const int program_birth_year = 2003;
|
||||||
|
|
||||||
|
@ -3680,7 +3683,7 @@ void show_help_default(const char *opt, const char *arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called from the main */
|
/* Called from the main */
|
||||||
int main(int argc, char **argv)
|
int video_main(NSMovie *movie, NSMovieView *view) //(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int flags;
|
int flags;
|
||||||
VideoState *is;
|
VideoState *is;
|
||||||
|
@ -3688,7 +3691,7 @@ int main(int argc, char **argv)
|
||||||
init_dynload();
|
init_dynload();
|
||||||
|
|
||||||
av_log_set_flags(AV_LOG_SKIP_REPEATED);
|
av_log_set_flags(AV_LOG_SKIP_REPEATED);
|
||||||
parse_loglevel(argc, argv, options);
|
// parse_loglevel(argc, argv, options);
|
||||||
|
|
||||||
/* register all codecs, demux and protocols */
|
/* register all codecs, demux and protocols */
|
||||||
#if CONFIG_AVDEVICE
|
#if CONFIG_AVDEVICE
|
||||||
|
@ -3701,10 +3704,10 @@ int main(int argc, char **argv)
|
||||||
signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */
|
signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */
|
||||||
signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */
|
signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */
|
||||||
|
|
||||||
show_banner(argc, argv, options);
|
// show_banner(argc, argv, options);
|
||||||
|
|
||||||
parse_options(NULL, argc, argv, options, opt_input_file);
|
|
||||||
|
|
||||||
|
// parse_options(NULL, argc, argv, options, opt_input_file);
|
||||||
|
input_filename = [[[NSMovie URL] path] cString];
|
||||||
if (!input_filename) {
|
if (!input_filename) {
|
||||||
show_usage();
|
show_usage();
|
||||||
av_log(NULL, AV_LOG_FATAL, "An input file must be specified\n");
|
av_log(NULL, AV_LOG_FATAL, "An input file must be specified\n");
|
||||||
|
|
Loading…
Reference in a new issue