From a77d3c3138b867a7ce7a7fa9f4c6447a7f79a3db Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 15 Oct 2009 19:29:12 +0200 Subject: [PATCH] move load_subtitles into play_movie --- bin/mplayer.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/mplayer.pl b/bin/mplayer.pl index cf6ddc0..f964b37 100755 --- a/bin/mplayer.pl +++ b/bin/mplayer.pl @@ -67,10 +67,13 @@ epoll_ctl($epfd, EPOLL_CTL_ADD, fileno STDIN , EPOLLIN ) >= 0 || die $! epoll_ctl($epfd, EPOLL_CTL_ADD, fileno $from_mplayer , EPOLLIN ) >= 0 || die $!; #epoll_ctl($epfd, EPOLL_CTL_ADD, fileno $to_mplayer , EPOLLOUT ) >= 0 || die $!; +sub load_subtitles; + sub load_movie { warn "$movie ", -s $movie, " bytes $edl\n"; print $to_mplayer qq|loadfile "$movie"\n|; print $to_mplayer "get_property $_\n" foreach ( qw/metadata video_codec video_bitrate width height fps length/ ); + load_subtitles; } @@ -441,13 +444,15 @@ sub save_subtitles { } sub load_subtitles { + if ( ! -e "$subtitles.yaml" ) { + warn "no subtitles $subtitles to load\n"; + return; + } @subtitles = YAML::LoadFile "$subtitles.yaml"; warn "subtitles ", dump @subtitles; save_subtitles; } -load_subtitles if -e "$subtitles.yaml"; - sub edit_subtitles { print $to_mplayer qq|pause\n|; focus_term; -- 2.20.1