diverse små fikser

5 files changed, 19 insertions, 17 deletions

diff --git a/tools/merge_audio_stereo_track b/tools/merge_audio_stereo_track
index ccdf871..da8d90b 100644
--- a/tools/merge_audio_stereo_track
+++ b/tools/merge_audio_stereo_track
@@ -17,7 +17,9 @@ fi
 
 ./audio_extract $1
 ./split_audio $NAME.$AFORMAT
-#./merge_av $NAME-new.$AFORMAT $1
+./merge_av $NAME.$AFORMAT $1
+
+rm $NAME.$AFORMAT
 
 #rm $1 $NAME.$AFORMAT $NAME-new.$AFORMAT
 #mv $NAME-new.$EXT $1
diff --git a/tools/nuug.csv b/tools/nuug.csv
index d3f90a4..5e327e0 100644
--- a/tools/nuug.csv
+++ b/tools/nuug.csv
@@ -1,2 +1,2 @@
 "Filename","Logo","Name","Title","What","Date","Location","Genre","Organization","Contact","License","Language","Takk","Takk","Takk","Takk","URL"
-"20100112-munin.dv","NUUG-logo-2-150-2.png","Nicolai Langfeldt","Munin","NUUG medlemsmøte","2010-01-12","Høgskolen I Oslo","Foredrag","NUUG","sekretariat@nuug.no","cc-by-sa-3.0-no","en","Introduksjon:Petter Reinholdtsen","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Stian Hubener","http://nuug.no/"
+"20100112-munin.dv","NUUG-logo-2-150-2.png","Nicolai Langfeldt","Munin","NUUG medlemsmøte","2010-01-12","Høgskolen I Oslo","Foredrag","NUUG","sekretariat@nuug.no","cc-by-sa-3.0-no","en","Introduksjon:Petter Reinholdtsen","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Stian Hübener","http://www.nuug.no/"
diff --git a/tools/outro b/tools/outro
index a144376..1a65348 100755
--- a/tools/outro
+++ b/tools/outro
@@ -56,6 +56,7 @@ for i in $URL ; do
 	./image_text $1 outro-$COUNT black " "
 	./fade $BASENAME-outro-$COUNT.png 1 black
 	rm $BASENAME-outro-$COUNT.png
+	COUNT=`expr $COUNT + 1`
 
 	./image_text $1 outro-$COUNT black "$i"
 	./fade $BASENAME-outro-$COUNT.png 2 black
diff --git a/tools/process-video b/tools/process-video
index 150fbf7..1c7e5cf 100644
--- a/tools/process-video
+++ b/tools/process-video
@@ -25,7 +25,7 @@ fi
 ./audio_channels_diff $1
 if [ "${?}" == "3" ] ; then
 #	echo "should run ./merge_audio_stereo_track $1...neh.."
-#	#./merge_audio_stereo_track $1
+	./merge_audio_stereo_track $1
 fi
 
 
@@ -63,9 +63,11 @@ rm $NAME-intro.$EXT $NAME-outro.$EXT $NAME-temp.dv
 ##mv $1 $NAME-old.$EXT
 ##mv $NAME-new.$EXT $1
 
-./convert2theora $1
-rm $NAME.ogv-compresslog
-./metadata $NAME.ogv $2
+#./convert2theora $1
+#rm $NAME.ogv-compresslog
+#./metadata $NAME.ogv $2
 
 ##./convert2vorbis $1
 ##./metadata $NAME.ogg $2
+
+scp $1 oklien@nerdhaven.nuug.no:/data/video/raw/
diff --git a/tools/split_audio b/tools/split_audio
index 0835870..bd8dde3 100644
--- a/tools/split_audio
+++ b/tools/split_audio
@@ -16,26 +16,23 @@ if [ -z "$1" ]; then
 	exit 1
 fi
 
-#sox $1 -c 1 left.wav mixer -l 2> /dev/null
-#sox $1 -c 1 right.wav mixer -r 2> /dev/null
 ./audio_split $1
 
 echo -n " * Merging channels to mono..."
-sox -m $NAME-left.wav $NAME-right.wav $NAME-mono.wav
-# 2> /dev/null
+sox -m $NAME-left.wav $NAME-right.wav $NAME-mono.wav 2> /dev/null
 echo -e "OK!"
 
 echo -n " * Creating two-channel-stereo from mono..."
-sox $NAME-mono.wav -c 2 $NAME-stereo.wav
-# 2> /dev/null
+sox $NAME-mono.wav -c 2 $NAME-stereo.wav 2> /dev/null
 echo -e "OK!"
 
-echo -n " * Encoding to format: $EXT with bitrate $BITRATE
-k)..."
-ffmpeg -i $NAME-stereo.wav -acodec $EXT -ab "$BITRATE"k $NAME-new.$EXT 
+# stereo filen er allerede ok for dv-lyd!
+#echo -n " * Encoding to format: $EXT with bitrate $BITRATE k)..."
+#ffmpeg -i $NAME-stereo.wav -acodec $EXT -ab "$BITRATE"k $NAME-new.$EXT 
 #2> /dev/null
-echo -e "OK!"
+#echo -e "OK!"
 
 echo -n " * Removing temp. sound files..."
-#rm $NAME-left.wav $NAME-right.wav $NAME-mono.wav $NAME-stereo.wav
+rm $NAME-left.wav $NAME-right.wav $NAME-mono.wav $NAME.wav
+mv $NAME-stereo.wav $NAME.wav 
 echo -e "OK!"