Cabrio fix + new features

.gitignore

@@ -0,0 +1,11 @@
+*.o
+cabrio
+
+.bzr
+.bzrignore
+.pc
+
+debian/cabrio.debhelper.log
+debian/cabrio.substvars
+debian/cabrio
+debian/files

Makefile

@@ -1,11 +1,26 @@
 CC=gcc
 BIN_DIR=/usr/bin
 DATA_DIR=/usr/share/cabrio
-CFLAGS=-g -Wall -DDATA_DIR=\"$(DATA_DIR)\"
-LDFLAGS=-lGL -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer -lGLU -lxml2 \
-	-lavutil -lavformat -lavcodec -lswscale
+OPTIMIZE=-O3 -ffast-math
+ifeq ($(DEBUG), 1)
+   OPTIMIZE=-O0
+endif
+CFLAGS+=-g -Wall $(OPTIMIZE) -DDATA_DIR=\"$(DATA_DIR)\"
+LDFLAGS+=-lGL -lSDL2 -lSDL2_image -lSDL2_gfx -lSDL2_ttf -lSDL2_mixer -lGLU -lxml2
 INCLUDES=-I./include -I/usr/include/libxml2
 
+# Works with libav 9.18 and 10.7 (buggy with this, weird behavior)
+ifneq (,$(BUNDLED_LIBAV))
+	LIBAV_PATH=libav
+	LDFLAGS+=-L./$(LIBAV_PATH)/linux/lib -lavformat -lavcodec -lavutil -lswscale -lm -lz -lpthread
+	INCLUDES+=-I./$(LIBAV_PATH)/linux/include
+	ifeq (,$(wildcard ./$(LIBAV_PATH)/linux/lib/libavformat.a))
+		TMP:=$(shell cp -f ./build_libav_linux.sh ./$(LIBAV_PATH)/ && cd $(LIBAV_PATH)/ && ./build_libav_linux.sh)
+	endif
+else
+	LDFLAGS+=-lavutil -lavformat -lavcodec -lswscale
+endif
+
 INSTALL=/usr/bin/install -c
 
 cabrio: main.o ogl.o sdl_wrapper.o config.o bg.o menu.o game_sel.o \
@@ -23,6 +38,8 @@ install: cabrio
 	$(INSTALL) -m 644 -t $(DATA_DIR)/pixmaps data/pixmaps/*
 	$(INSTALL) -m 644 -t $(DATA_DIR)/sounds data/sounds/*	
 	$(INSTALL) -m 755 -d $(DATA_DIR)/themes
+	$(INSTALL) -m 755 -d $(DATA_DIR)/themes/lmc
+	$(INSTALL) -m 644 -t $(DATA_DIR)/themes/lmc data/themes/lmc/*
 	$(INSTALL) -m 755 -d $(DATA_DIR)/themes/carousel
 	$(INSTALL) -m 644 -t $(DATA_DIR)/themes/carousel data/themes/carousel/*
 	$(INSTALL) -m 755 -d $(DATA_DIR)/themes/ice
@@ -31,6 +48,7 @@ install: cabrio
 	$(INSTALL) -m 644 -t $(DATA_DIR)/themes/industrial data/themes/industrial/*
 	$(INSTALL) -m 755 -d $(DATA_DIR)/themes/wood
 	$(INSTALL) -m 644 -t $(DATA_DIR)/themes/wood data/themes/wood/*
+	$(INSTALL) -m 644 -t $(DATA_DIR)/../applications/ cabrio.desktop
 	$(INSTALL) -m 755 -d $(BIN_DIR)
 	$(INSTALL) -m 755 -t $(BIN_DIR) cabrio
 

README

@@ -1,4 +1,101 @@
-Cabrio
+TODO: HELP NEEDED ! 
+- Link a theme for each list - 
+- Video with some freezes and memory leaks ... -
+
+Version from "Livemamecab" https://github.com/fredbcode/livemamecab 
+Demo ISO Here http://traceroot.c.la
+Ubuntu PPA here https://launchpad.net/~sergio-br2/+archive/ubuntu/cabrio (Thanks Sergio Benjamim)
+
+- Added <music> tag to themes, allowing selection of background music by Pieter Hulshoff
+- Fixed memory leaks in XML configuration functions by Pieter Hulshoff
+- Improved handling of long game lists by Pieter Hulshoff 
+- Fix ffmpeg problem, should works with libavcodec53/54/55 fixed by f.dorin
+- New option "video loop" for snap
+- New option "video sound" for snap
+- New option "theme sound" music theme onf/off
+- New option "theme sound" volume (1 min -> 128 Max)  
+- New option direct switch to list 
+- New option hide buttons 
+- Save selection game at cabrio start 
+- SDL2 support by sergio-br2
+
+New options:
+
+<video-loop>false/true</video-loop>
+<video-sound>false/true</video-sound> 
+<theme-sound>false/true</theme-sound>
+<music-volume>50</music-volume>
+<hide-buttons>false/true</hide-buttons>
+<concat-path>false/true</concat-path>
+
+Option for music:
+
+Put your music here /usr/share/cabrio/sounds/music.mp3
+You can also use the tag <music> placed within the <theme> tag (in a theme XML file).
+A directory indication will cause a random music file to be selected from that directory. 
+In your theme file:
+
+<name>lmc</name>
+<music>/path/music/</music>
+
+Option for direct list:
+
+Example: keyboard touch "a" to directly switch to the first list and "b" for the second (max 5 lists)
+
+<event>
+<name>list1</name>
+<value>a</value>
+<device>
+  <type>keyboard</type>
+  <id>0</id>
+</device>
+</event>
+<event>
+<name>list2</name>
+<value>b</value>
+<device>
+  <type>keyboard</type>
+  <id>0</id>
+</device>
+</event>
+
+Option to use full path for roms:
+
+You can use directory tag to indicate a rom folder, so you don't need to use
+full path in the rom-image tag. But some emulators have problem with this, 
+because they need the full path instead Cabrio default approach: it first go
+to the directory, and then executes the emulator. So you can use concat-path
+tag, it will join both directory and rom-image in one string only:
+
+<emulators>
+  <emulator>
+    <name>MAME</name>
+    <display-name>MAME</display-name>
+    <executable>retroarch</executable>
+    <platform>Arcade</platform>
+    <directory>/home/your-user/Path/to/your/ROMs/</directory>
+    <concat-path>true</concat-path>
+    <params>
+      <param>
+        <name>-L</name>
+      </param>
+      <param>
+        <name>/usr/lib/libretro/mame_libretro.so</name>
+      </param>
+    </params>
+  </emulator>
+</emulators>
+[...]
+<game>
+  <name>After Burner II</name>
+  <platform>Arcade</platform>
+  <rom-image>aburner2.zip</rom-image>
+</game>
+
+This results:
+
+retroarch -L /usr/lib/libretro/mame_libretro.so /home/your-user/Path/to/your/ROMs/aburner2.zip
+
 ======
 
 Cabrio is an emulator front-end primarily designed for use with arcade
@@ -9,11 +106,11 @@ with limited controls (e.g. a joystick).
 Installation
 ------------
 You will need the following libraries and their headers/development packages:
-  * SDL
-  * SDL_image
-  * SDL_gfx
-  * SDL_mixer
-  * SDL_ttf
+  * SDL2
+  * SDL2_image
+  * SDL2_gfx
+  * SDL2_mixer
+  * SDL2_ttf
   * glut
   * libxml2
   * ffmpeg
@@ -24,6 +121,10 @@ can be edited in the Makefile).
 
 See http://www.cabrio-fe.org/support/compile.html for more information.
 
+Debian/Ubuntu:
+
+apt-get install gcc make libc6-dev libavcodec-dev libavutil-dev libavformat-dev libswscale-dev libsdl2-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-mixer-dev libsdl2-ttf-dev libxml2-dev
+
 
 Configuration
 -------------
@@ -46,3 +147,6 @@ Astronomy, Heidelberg). http://hubblesite.org/
 
 Default font "FreeSans.ttf" courtesy of the GNU FreeFont project:
 http://www.gnu.org/software/freefont/
+
+Music Theme: Happy Arcade Tune 	
+Author: rezoner from http://opengameart.org

build_libav_linux.sh

@@ -0,0 +1,88 @@
+#!/bin/sh
+
+rm -f config.h
+echo "Building for Linux"
+
+GENERAL="
+   --disable-shared \
+   --enable-static"
+
+MODULES="\
+   --disable-avresample \
+   --disable-avdevice \
+   --disable-filters \
+   --disable-programs \
+   --disable-network \
+   --disable-avfilter \
+   --disable-encoders \
+   --disable-doc \
+   --disable-avplay \
+   --disable-avprobe \
+   --disable-avserver"
+
+VIDEO_DECODERS="\
+   --enable-decoder=h264 \
+   --enable-decoder=h263 \
+   --enable-decoder=h263p \
+   --enable-decoder=mpeg2video"
+
+AUDIO_DECODERS="\
+    --enable-decoder=aac \
+    --enable-decoder=atrac3 \
+    --enable-decoder=atrac3p \
+    --enable-decoder=mp3 \
+    --enable-decoder=pcm_s16le \
+    --enable-decoder=pcm_s8"
+
+DEMUXERS="\
+    --enable-demuxer=mov \
+    --enable-demuxer=h264 \
+    --enable-demuxer=mpegps \
+    --enable-demuxer=mpegvideo \
+    --enable-demuxer=avi \
+    --enable-demuxer=mp3 \
+    --enable-demuxer=aac \
+    --enable-demuxer=oma \
+    --enable-demuxer=pcm_s16le \
+    --enable-demuxer=pcm_s8 \
+    --enable-demuxer=wav"
+
+VIDEO_ENCODERS="\
+	  --enable-encoder=huffyuv \
+	  --enable-encoder=ffv1 \
+	  --enable-encoder=mjpeg"
+
+AUDIO_ENCODERS="\
+	  --enable-encoder=pcm_s16le"
+
+MUXERS="\
+  	--enable-muxer=avi"
+
+PARSERS="\
+    --enable-parser=h264 \
+    --enable-parser=mpeg4video \
+    --enable-parser=mpegvideo \
+    --enable-parser=aac \
+    --enable-parser=mpegaudio"
+
+
+./configure \
+    --prefix=./linux \
+    ${GENERAL} \
+    --extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
+    --enable-zlib \
+    --enable-pic \
+    --disable-yasm \
+    --disable-everything \
+    --enable-protocol=file \
+    ${MODULES} \
+    ${VIDEO_DECODERS} \
+    ${AUDIO_DECODERS} \
+    ${VIDEO_ENCODERS} \
+    ${AUDIO_ENCODERS} \
+    ${DEMUXERS} \
+    ${MUXERS} \
+    ${PARSERS}
+
+make clean
+make install

cabrio.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Cabrio
+GenericName=Front End for Emulators
+Comment=Graphical front end for video game emulators
+Exec=cabrio %f
+Categories=Game;Emulator;

category.c

@@ -62,6 +62,7 @@ int category_value_add( struct category *category, char *name ) {
 	struct category_value *search = category->values;
 	struct category_value *after = category->values;
 	struct category_value *category_value = malloc( sizeof(struct category_value) );
+	int i = 0;
 
 	if( search ) {
 		do {
@@ -74,6 +75,13 @@ int category_value_add( struct category *category, char *name ) {
 	if( category_value ) {
 		memset( category_value, 0, sizeof(struct category_value) );		
 		category_value->name = name;
+		while( i < 4) {		
+			if (!list_choice[i]) { 
+					list_choice[i]=name;
+					break;
+			}
+		i++;
+		}
 
 		if( after ) {
 			after = after->prev;
@@ -160,7 +168,6 @@ void catgeory_dump( void ) {
 		printf("Category: %s (%d)\n", category->name, category->value_count );
 		struct category_value *value = category->values;
 		while( value ) {
-			printf("  Value: %s\n", value->name );
 			value = value->next;
 			if( value == category->values ) break;
 		}