More generic support for separating "sections". Initial stubs for support of parallel utility.

6 files changed, 46 insertions, 14 deletions

diff --git a/combiner/Combiner.pm b/combiner/Combiner.pm
index 6fce519..9bf29a3 100644
--- a/combiner/Combiner.pm
+++ b/combiner/Combiner.pm
@@ -5,8 +5,8 @@ use warnings;
 use Exporter;
 
 our @ISA = qw(Exporter);
-our @EXPORT_OK = qw(nop init_w32 init_w64 combiner combiners w32);
-our @EXPORT = qw(nop init_w32 init_w64 combiner combiners w66);
+our @EXPORT_OK = qw(nop init_w32 init_w64 parallel parallel_w32 parallel_w64 newline end_parallel combiner combiners w32);
+our @EXPORT = qw(nop init_w32 init_w64 parallel parallel_w32 parallel_w64 newline end_parallel combiner combiners w66);
 
 our $w32 = '/usr/i686-w64-mingw32/sys-root/mingw/bin/';
 our $w64 = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/';
@@ -26,6 +26,34 @@ sub init_w64() {
 }
 
 
+sub parallel() {
+	print "parallel -v --halt 1 --colsep ' ' <<EOF\n";
+}
+
+
+sub parallel_w32() {
+	init_w32();
+	parallel();
+}
+
+
+sub parallel_w64() {
+	init_w64();
+	parallel();
+}
+
+
+sub newline() {
+	print "\n";
+}
+
+
+sub end_parallel() {
+	print "EOF\n";
+	print "\n";
+}
+
+
 sub combiner($$) {
 	my ($callback, $comb) = @_;
 	my (@s, @n, $i, @comb, @single);
@@ -73,10 +101,11 @@ sub combiner($$) {
 }
 
 
-sub combiners($$$) {
-	my ($inits, $callbacks, $combs) = @_;
-	my ($i, $j, @inits, @combs, @callbacks);
+sub combiners($$$$) {
+	my ($inits, $ends, $callbacks, $combs) = @_;
+	my ($i, $j, @inits, @ends, @combs, @callbacks);
 	@inits = @$inits;
+	@ends = @$ends;
 	@combs = @$combs;
 	@callbacks = @$callbacks;
 
@@ -86,7 +115,7 @@ sub combiners($$$) {
 		foreach $i (0..$#combs) {
 			combiner($callbacks[$j], \@{$combs[$i]});
 		}
-		print "\n";
+		$ends[$j]->();
 	}
 }
 
diff --git a/combiner/flac.pl b/combiner/flac.pl
index a4d6b0e..a4fc025 100755
--- a/combiner/flac.pl
+++ b/combiner/flac.pl
@@ -31,6 +31,7 @@ my @combs = (
 	);
 
 my @inits = (\&nop, \&init_w32, \&init_w64);
+my @ends = (\&newline, \&newline, \&newline);
 
 my @callbacks = (
 	sub($$) {
diff --git a/combiner/libmad.pl b/combiner/libmad.pl
index 266a9c1..54c1ddc 100755
--- a/combiner/libmad.pl
+++ b/combiner/libmad.pl
@@ -20,6 +20,7 @@ my @combs = (
 );
 
 my @inits = (\&nop, \&init_w64);
+my @ends = (\&newline, \&newline);
 
 my @callbacks = (
 	sub($$) {
@@ -40,7 +41,7 @@ mkdir linux win64
 
 ];
 
-combiners(\@inits, \@callbacks, \@combs);
+combiners(\@inits, \@ends, \@callbacks, \@combs);
 
 print qq[
 pushd linux
diff --git a/combiner/libmad32.pl b/combiner/libmad32.pl
index 0c8bd27..e1b1ae8 100755
--- a/combiner/libmad32.pl
+++ b/combiner/libmad32.pl
@@ -20,6 +20,7 @@ my @combs = (
 );
 
 my @inits = (\&nop, \&init_w32);
+my @ends = (\&newline, \&newline);
 
 my @callbacks = (
 	sub($$) {
@@ -40,7 +41,7 @@ mkdir linux32 win32
 
 ];
 
-combiners(\@inits, \@callbacks, \@combs);
+combiners(\@inits, \@ends, \@callbacks, \@combs);
 
 print qq[
 pushd linux32
diff --git a/combiner/speex.pl b/combiner/speex.pl
index 7566523..5f09476 100755
--- a/combiner/speex.pl
+++ b/combiner/speex.pl
@@ -20,6 +20,7 @@ my @combs = (
 );
 
 my @inits = (\&nop, \&init_w64);
+my @ends = (\&newline, \&newline);
 my @callbacks = (
 	sub($$) {
 		my ($name, $opts) = @_;
@@ -59,6 +60,5 @@ mkdir linux win64 linux-win64
 
 ];
 
-combiners(\@inits, \@callbacks, \@combs);
-
-combiners(\@inits_dec, \@callbacks_dec, \@combs);
+combiners(\@inits, \@ends, \@callbacks, \@combs);
+combiners(\@inits_dec, \@ends, \@callbacks_dec, \@combs);
diff --git a/combiner/wavpack.pl b/combiner/wavpack.pl
index 3a0e24f..4b359c0 100755
--- a/combiner/wavpack.pl
+++ b/combiner/wavpack.pl
@@ -31,6 +31,7 @@ my @combs = (
 	);
 
 my @inits = (\&nop, \&init_w32, \&init_w64);
+my @ends = (\&newline, \&newline, \&newline);
 
 my @callbacks = (
 	sub($$) {
@@ -75,6 +76,5 @@ mkdir linux win32 win64
 
 ];
 
-combiners(\@inits, \@callbacks, \@combs);
-
-combiners(\@inits, \@callbacks_dec, \@combs);
+combiners(\@inits, \@ends, \@callbacks, \@combs);
+combiners(\@inits, \@ends, \@callbacks_dec, \@combs);