435 changes: 0 additions & 435 deletions nuvexport/export/transcode.pm

This file was deleted.

92 changes: 0 additions & 92 deletions nuvexport/export/transcode/DVCD.pm

This file was deleted.

156 changes: 0 additions & 156 deletions nuvexport/export/transcode/DVD.pm

This file was deleted.

182 changes: 0 additions & 182 deletions nuvexport/export/transcode/SVCD.pm

This file was deleted.

113 changes: 0 additions & 113 deletions nuvexport/export/transcode/VCD.pm

This file was deleted.

172 changes: 0 additions & 172 deletions nuvexport/export/transcode/XviD.pm

This file was deleted.

9 changes: 3 additions & 6 deletions nuvexport/nuv_export/cli.pm
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ package nuv_export::cli;
my %args;

# Load some options early, before anything else:
# --ffmpeg, --transcode and --config
# --ffmpeg, --mencoder and --config
our $export_prog = undef;
our $config_file = undef;
GetOptions('ffmpeg' => sub { $export_prog = 'ffmpeg'; },
'transcode' => sub { $export_prog = 'transcode'; },
'mencoder' => sub { $export_prog = 'mencoder'; },
'config|c=s' => \$config_file,
'profile=s' => \$args{'profile'},
Expand Down Expand Up @@ -114,17 +113,15 @@ package nuv_export::cli;
$export_prog = lc($rc_args{'nuvexport'}{'export_prog'});
}
if ($export_prog) {
if ($export_prog !~ /(?:ffmpeg|transcode|mencoder)$/) {
if ($export_prog !~ /(?:ffmpeg|mencoder)$/) {
print "Unknown export_prog in nuvexportrc: $export_prog\n\n";
exit;
}
}
else {
$export_prog = find_program('ffmpeg')
? 'ffmpeg'
: find_program('transcode')
? 'transcode'
: 'mencoder';
: 'mencoder';
}
}

Expand Down
21 changes: 2 additions & 19 deletions nuvexport/nuvexport
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,7 @@
or die "You need mythtranscode in order to use nuvexport.\n\n";

# Load the exporters based on which suite was selected above
if ($export_prog eq 'transcode') {
find_program('transcode')
or die "You need transcode in order to use nuvexport in --transcode mode\n";
# transcode - doesn't seem to work for many MPEG recordings these days
require export::transcode::XviD;
require export::transcode::SVCD;
require export::transcode::VCD;
require export::transcode::DVCD;
require export::transcode::DVD;
}
elsif ($export_prog eq 'ffmpeg') {
if ($export_prog eq 'ffmpeg') {
find_program('ffmpeg')
or die "You need ffmpeg in order to use nuvexport in --ffmpeg mode\n";
# ffmpeg - seems to work better and is the default
Expand Down Expand Up @@ -94,14 +84,7 @@
load_cli_args();

# Now that we've loaded the cli args, we can define the exporters
if ($export_prog eq 'transcode') {
push @Exporters, export::transcode::XviD->new;
push @Exporters, export::transcode::SVCD->new;
push @Exporters, export::transcode::VCD->new;
push @Exporters, export::transcode::DVCD->new;
push @Exporters, export::transcode::DVD->new;
}
elsif ($export_prog eq 'ffmpeg') {
if ($export_prog eq 'ffmpeg') {
push @Exporters, export::ffmpeg::XviD->new;
push @Exporters, export::ffmpeg::SVCD->new;
push @Exporters, export::ffmpeg::VCD->new;
Expand Down
35 changes: 6 additions & 29 deletions nuvexport/nuvexportrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<nuvexport>

#
# Set export_prog to ffmpeg, transcode or mencoder, depending on your
# preference of program for exports. This is equivalent to --ffmpeg,
# --transcode or --mencoder
# Set export_prog to ffmpeg or mencoder, depending on your
# preference of program for exports. This is equivalent to --ffmpeg or
# --mencoder
#
export_prog=ffmpeg

Expand Down Expand Up @@ -257,8 +257,8 @@
# matches in the full or generic module names.
#
# If you have a particularly dirty signal, you might want to try to disable
# fast_denoise (it's actually part of yuvdenoise, which both the ffmpeg
# and transcode exporters call). It can be almost twice as slow as the
# fast_denoise (it's actually part of yuvdenoise, which the ffmpeg
# exporters call). It can be almost twice as slow as the
# default "fast" normal noise reduction, but it considerably more
# effective. The latest version of yuvdenoise (which is called directly
# by the ffmpeg exporters) does not support this option, so it is ignored
Expand Down Expand Up @@ -290,29 +290,6 @@
#
</ffmpeg>

<transcode>

#
# Mythtranscode will always be used for nupplevideo recordings because
# transcode can't read them, but setting force_mythtranscode to yes will
# force nuvexport to call mythtranscode when using the transcode exporter
# for mpeg recordings, too. This may help problems that some people have
# been having with transcode not recognizing certain dvb recordings, as
# well as transcode not working properly on certain ivtv recordings.
#
force_mythtranscode = yes

#
# Setting both force_mythtranscode and mythtranscode_cutlist to yes will
# tell nuvexport to use mythtranscode's built-in cutlist functions,
# rather than having transcode use its own. I've found that the cutlists
# for a handful of ivtv recordings that do not work properly with
# transcode's internal cutlist handler.
#
mythtranscode_cutlist = yes

</transcode>

<mencoder>
</mencoder>

Expand Down Expand Up @@ -446,7 +423,7 @@

title = test

export_prog = transcode
export_prog = ffmpeg
mode = xvid
confirm = true

Expand Down