create just montage, resize is in mplayer.pl

diff --git a/README b/README
index 517f4f7..e3fb517 100644 (file)
--- a/README
+++ b/README
@@ -154,10 +154,10 @@ Create media/conference-title/www file with source urls for video and presentati
        # annotate some material
        $ ./bin/mplayer.pl
 
-       # resize presentation and show montage preview
-       $ ./bin/slides-resize.sh
+       # show montage preview of all slides
+       $ ./bin/slides-montage.sh
 
-You will probably want to run resize after you made first annotation in mplayer
+You will probably want to run slides-montage.sh after you made first annotation in mplayer
 because you will get visual overview of all available slides which is useful
 when typing in slide markers [42] in subtitles.
 

diff --git a/bin/slides-monrage.sh b/bin/slides-monrage.sh
new file mode 100755 (executable)
index 0000000..ea782b3
--- /dev/null
+++ b/bin/slides-monrage.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+dir=www/media/s
+
+ls -d $dir/* | grep x | sed "s,$dir/*,," | sort -n -r | while read size ; do
+       echo "# $size";
+
+       if [ ! -e $dir/bars.png ] ; then
+               convert media/SMPTE_Color_Bars.svg -geometry $size $dir/bars.png
+       fi
+
+       montage -geometry +1+1 -frame 3 -label %f $dir/$size/* $dir/$size.png
+       qiv $dir/$size.png
+done
+

diff --git a/bin/slides-resize.sh b/bin/slides-resize.sh
deleted file mode 100755 (executable)
index d5d2c64..0000000
--- a/bin/slides-resize.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-dir=www/media/s
-
-ls -d $dir/* | grep x | sed "s,$dir/*,," | sort -n -r | while read size ; do
-       echo "# $size";
-
-       if [ ! -e $dir/bars.png ] ; then
-               convert media/SMPTE_Color_Bars.svg -geometry $size $dir/bars.png
-       fi
-
-       ls $dir/hires/* | sed "s,$dir/hires/,," | xargs -i convert $dir/hires/{} -resize $size $dir/$size/{}
-       montage -geometry +1+1 -frame 3 -label %f $dir/$size/* $dir/$size.png
-       qiv $dir/$size.png
-done
-