[Armadeus-commitlog] SF.net SVN: armadeus: [642] trunk/buildroot/package/slideshow

[<ar...@us...>]

Revision: 642
          http://armadeus.svn.sourceforge.net/armadeus/?rev=642&view=rev
Author:   artemys
Date:     2007-09-12 14:45:30 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
[PACKAGES] Patches slideshow package to prevent it to stop when all images have been shown (now it should loop)

Added Paths:
-----------
    trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
    trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch

Removed Paths:
-------------
    trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch

Copied: trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch (from rev 638, trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch)
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -0,0 +1,26 @@
+--- slideshow/Makefile	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/Makefile	2007-09-05 12:08:56.000000000 +0200
+@@ -1,6 +1,12 @@
++ifeq ($(ARCH), arm)
++CFLAGS = -O2 `sh ../SDL-1.2.11/sdl-config --cflags`
++LFLAGS = `sh ../SDL-1.2.11/sdl-config --libs` -lSDL_image
++CC = arm-linux-g++
++else
+ CFLAGS = -O2 -march=i586 `sdl-config --cflags`
+ LFLAGS = `sdl-config --libs` -lSDL_image
+ CC = g++
++endif
+ EXE = slideshow
+ OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
+ 
+--- slideshow/SDLFont.h	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/SDLFont.h	2007-09-05 12:11:17.000000000 +0200
+@@ -34,7 +34,7 @@
+ // The value of the top-left pixel in the font bitmap will be
+ //  considered transparent.  Anything else is opaque.
+ 
+-#include <SDL/SDL.h>
++#include "SDL.h"
+ 
+ class SDLFont
+ {

Added: trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -0,0 +1,73 @@
+--- slideshow/slideshow.cpp	2003-12-08 22:17:38.000000000 +0100
++++ slideshow.mod/slideshow.cpp	2007-09-08 19:05:10.000000000 +0200
+@@ -196,43 +196,48 @@
+ 			SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
+ 			SDL_UpdateRects(m_sdl, 1, &rc);
+ 		}
+-
+-		user_command cmd = wait_for_command();
+-
++
++		user_command cmd = wait_for_command();
++
+ 		switch(cmd)
+-		{
+-		case c_quit:
+-			stop_timer();
+-			return true;
+-		case c_first_slide:
++		{
++		case c_quit:
++			stop_timer();
++			return true;
++		case c_first_slide:
+ 			stop_timer();
+ 			m_image_index = 0;
+ 			break;
+ 		case c_last_slide:
+-			stop_timer();
++			stop_timer();
+ 			m_image_index = m_file_list->count() - 1;
+-			break;
++			break;
+ 		case c_prev_slide:
+-			stop_timer();
++			stop_timer();
+ 			if ( m_image_index > 0 )
+ 				m_image_index--;
+ 			break;
+ 		case c_next_slide:
+-			stop_timer();
+-			// fall through
+-		case c_timer_advance:
+-			if ( m_image_index < m_file_list->count() - 1 )
++			stop_timer();
++			// fall through
++		case c_timer_advance:
++			if ( m_image_index <= m_file_list->count() - 1 )
+ 				m_image_index++;
+-			break;
+-		case c_redraw:
+ 			break;
+-		}
++		case c_redraw:
++			break;
++		}
+ 
+ 		// stop the auto-advance when the last picture is about to be shown
+-		if ( m_image_index == m_file_list->count() - 1 )
+-			stop_timer();
+-	}
+-
++		if ( m_image_index == m_file_list->count() /*- 1*/ )
++		{
++			//stop_timer();
++			m_image_index = 0;
++			m_prev_image_index = -1;
++		}
++
++	}
++
+ 	return true;
+ }
+ 

Deleted: trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	2007-09-11 20:54:23 UTC (rev 641)
+++ trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -1,26 +0,0 @@
---- slideshow/Makefile	2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/Makefile	2007-09-05 12:08:56.000000000 +0200
-@@ -1,6 +1,12 @@
-+ifeq ($(ARCH), arm)
-+CFLAGS = -O2 `sh ../SDL-1.2.11/sdl-config --cflags`
-+LFLAGS = `sh ../SDL-1.2.11/sdl-config --libs` -lSDL_image
-+CC = arm-linux-g++
-+else
- CFLAGS = -O2 -march=i586 `sdl-config --cflags`
- LFLAGS = `sdl-config --libs` -lSDL_image
- CC = g++
-+endif
- EXE = slideshow
- OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
- 
---- slideshow/SDLFont.h	2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/SDLFont.h	2007-09-05 12:11:17.000000000 +0200
-@@ -34,7 +34,7 @@
- // The value of the top-left pixel in the font bitmap will be
- //  considered transparent.  Anything else is opaque.
- 
--#include <SDL/SDL.h>
-+#include "SDL.h"
- 
- class SDLFont
- {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.