From 59a574a752bed221d12af2d0c24c17f5acbee823 Mon Sep 17 00:00:00 2001
From: artvertiser-binoculars <artvertiser@artvertiser.(none)>
Date: Tue, 9 Mar 2010 17:47:12 +0100
Subject: [PATCH] for arco stuff

	modified:   models.xml
	modified:   start.sh
---
 artvertiser/models.xml | 234 ++++++++++++++++++-------------------------------
 artvertiser/start.sh   |   9 +-
 2 files changed, 93 insertions(+), 150 deletions(-)
 rewrite artvertiser/models.xml (62%)

diff --git a/artvertiser/models.xml b/artvertiser/models.xml
dissimilarity index 62%
index 2c03609..d2d71f3 100644
--- a/artvertiser/models.xml
+++ b/artvertiser/models.xml
@@ -1,148 +1,86 @@
-<artverts>
-	<!--	<advert>
-		<model_filename>model_00482_1.bmp</model_filename>
-		<advert>dunkin donuts</advert>
-		<artvert>
-			<name>artvert for 00482_1</name>
-			<artist>unknown artist</artist>
-			<image_filename>artvert1.png</image_filename>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>model_00482_4.bmp</model_filename>
-		<advert>dunkin donuts</advert>
-		<artvert>
-			<name>artvert for 00482_4</name>
-			<image_filename>artvert3.png</image_filename>
-			<artist>unknown artist</artist>
-		</artvert>
-	</advert>
-	-->
-	<advert>
-		<model_filename>models/posters1.bmp</model_filename>
-		<advert>kunst beer</advert>
-		<artvert>
-			<name>your art here</name>
-			<image_filename>artverts/your_art_here.png</image_filename>
-			<artist>us</artist>
-		</artvert>
-		<artvert>
-			<name>USB Bomb</name>
-			<image_filename>artverts/usb_bomb.png</image_filename>
-			<artist>us</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters4.bmp</model_filename>
-		<advert>Sport Hilfe</advert>
-		<artvert>
-			<name>Paradise Berlin</name>
-			<image_filename>artverts/posters4.png</image_filename>
-			<artist>us</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters7.bmp</model_filename>
-		<advert>Rathaus Passagen</advert>
-		<artvert>
-			<name>Rathaus Passagen</name>
-			<image_filename>artverts/spider.png</image_filename>
-			<artist>us</artist>
-		</artvert>
-	</advert>
-
-	<advert>
-		<model_filename>models/posters8.bmp</model_filename>
-		<advert>Motor Welt</advert>
-		<artvert>
-			<name>You're not here</name>
-			<image_filename>artverts/mountains.jpg</image_filename>
-			<artist>us</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters9.bmp</model_filename>
-		<advert>94.3 RS2</advert>
-		<artvert>
-			<name>obey</name>
-			<image_filename>artverts/obey.png</image_filename>
-			<artist>obey</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/ships.bmp</model_filename>
-		<advert>Sparkasse</advert>
-		<artvert>
-			<name>A Tradition of The Best Advice</name>
-			<movie_filename>artverts/advice_flat.mp4</movie_filename>
-			<artist>Jason Reizner</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters11.bmp</model_filename>
-		<advert>Pixar</advert>
-		<artvert>
-			<name>Enlightenment</name>
-			<image_filename>artverts/Enlightenment.jpg</image_filename>
-			<artist>Bjorn Erik Haugen</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters12.bmp</model_filename>
-		<advert>Avene/Apotheke</advert>
-		<artvert>
-			<name>Temple of Health</name>
-			<image_filename>artverts/01_The_temple_of_health.jpg</image_filename>
-			<artist>Ivana Kohlhammer</artist>
-		</artvert>
-		<artvert>
-			<name>Untitled</name>
-			<image_filename>artverts/woman_art_Torres.jpg</image_filename>
-			<artist>Gerardo Torres</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters13.bmp</model_filename>
-		<advert>La Roche</advert>
-		<artvert>
-			<name>Hair Helmuts are Super Cool</name>
-			<image_filename>artverts/laroche-ad-hairJustinYoung1500x980.jpg</image_filename>
-			<artist>Justin Young</artist>
-		</artvert>
-		<artvert>
-			<name>Untitled</name>
-			<image_filename>artverts/laroche-ad-pattern-JustinYoung850x555.jpg</image_filename>
-			<artist>Justin Young</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>models/posters15.bmp</model_filename>
-		<advert>Ulla</advert>
-		<artvert>
-			<name>Publicity Against Consumption</name>
-			<movie_filename>artverts/publicity_against_consumption.mov</movie_filename>
-			<artist>Animazon</artist>
-		</artvert>
-	</advert>
-<!--	
-	<advert>
-		<model_filename>model_00482_3.bmp</model_filename>
-		<advert>dunkin donuts</advert>
-		<artvert>
-			<name>artvert for 00482_3</name>
-			<image_filename>artvert2.png</image_filename>
-			<artist>unknown artist</artist>
-		</artvert>
-	</advert>
-	<advert>
-		<model_filename>model_00483_1.bmp</model_filename>
-		<advert>dunkin donuts</advert>
-		<artvert>
-			<name>artvert for 00483_1</name>
-			<image_filename>artvert4.png</image_filename>
-			<artist>unknown artist</artist>
-		</artvert>
-	</advert>
-	-->
-</artverts>
-
+<artverts>
+	<advert>
+		<model_filename>models/ships.bmp</model_filename>
+		<advert>ships</advert>
+		<artvert>
+			<name>your art here</name>
+			<image_filename>artverts/your_art_here.png</image_filename>
+			<artist>us</artist>
+		</artvert>
+	</advert>
+
+	<advert>
+		<model_filename>models/v2_test_lab/v2_1.bmp</model_filename>
+		<advert>v2 test lab 1</advert>
+		<artvert>
+			<name>USB Bomb</name>
+			<image_filename>artverts/usb_bomb.png</image_filename>
+			<artist>us</artist>
+		</artvert>
+	</advert>
+	<advert>
+		<model_filename>models/v2_test_lab/v2_2.bmp</model_filename>
+		<advert>v2 test lab 2</advert>
+		<artvert>
+			<name>USB Bomb</name>
+			<image_filename>artverts/usb_bomb.png</image_filename>
+			<artist>us</artist>
+		</artvert>
+	</advert>
+	<advert>
+		<model_filename>models/v2_test_lab/v2_3.bmp</model_filename>
+		<advert>v2 test lab 3</advert>
+		<artvert>
+			<name>USB Bomb</name>
+			<image_filename>artverts/usb_bomb.png</image_filename>
+			<artist>us</artist>
+		</artvert>
+	</advert>
+	<advert>
+		<model_filename>models/v2_test_lab/v2_4.bmp</model_filename>
+		<advert>v2 test lab 4</advert>
+		<artvert>
+			<name>USB Bomb</name>
+			<image_filename>artverts/usb_bomb.png</image_filename>
+			<artist>us</artist>
+		</artvert>
+	</advert>
+
+
+
+
+	<model_filename>models/posters10.bmp</model_filename>
+		<advert>Sparkasse</advert>
+		<artvert>
+			<name>A Tradition of The Best Advice</name>
+			<movie_filename>artverts/advice_flat.mp4</movie_filename>
+			<artist>Jason Reizner</artist>
+		</artvert>
+	</advert>
+
+	<advert>
+		<model_filename>models/posters13.bmp</model_filename>
+		<advert>La Roche</advert>
+		<artvert>
+			<name>Hair Helmuts are Super Cool</name>
+			<image_filename>artverts/laroche-ad-hairJustinYoung1500x980.jpg</image_filename>
+			<artist>Justin Young</artist>
+		</artvert>
+		<artvert>
+			<name>Untitled</name>
+			<image_filename>artverts/laroche-ad-pattern-JustinYoung850x555.jpg</image_filename>
+			<artist>Justin Young</artist>
+		</artvert>
+	</advert>
+	<advert>
+		<model_filename>models/posters15.bmp</model_filename>
+		<advert>Ulla</advert>
+		<artvert>
+			<name>Publicity Against Consumption</name>
+			<movie_filename>artverts/publicity_against_consumption.mov</movie_filename>
+			<artist>Animazon</artist>
+		</artvert>
+	</advert>
+
+</artverts>
+
diff --git a/artvertiser/start.sh b/artvertiser/start.sh
index 5f98ba2..82800fa 100755
--- a/artvertiser/start.sh
+++ b/artvertiser/start.sh
@@ -4,9 +4,14 @@
 touch start.sh.started
 
 # avoid shell interference (see info coreutils 'sleep invocation')
-echo start.sh sleeping 5 seconds
+echo start.sh sleeping 10 seconds
 env sleep 5
-/home/artvertiser/Desktop/working/The-Artvertiser/artvertiser/artvertiser -vd 0 -vs 640 480 -ml models.xml 2>&1 /home/artvertiser/Desktop/working/The-Artvertiser/artvertiser/artvertiser_via_start.sh.log
+echo 5
+env sleep 5
+echo sleeped
+echo starting artvertiser...
+/home/artvertiser/Desktop/working/The-Artvertiser/artvertiser/artvertiser -vd 0 -vs 640 480 -ml models.xml -binoc 2>&1 | tee /home/artvertiser/Desktop/working/The-Artvertiser/artvertiser/artvertiser_via_start.sh.log
+
 
 # say we finished
 touch start.sh.finished
-- 
2.11.4.GIT