[Swfdec-commits] 2 commits - configure.ac vivified/code

[Benjamin Otte]

 configure.ac                       |   20 +++++++++-----------
 vivified/code/vivi_code_defaults.h |    2 +-
 vivified/code/vivi_code_value.h    |    1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 22cff3dbe1384686c2c901992f36451d6e076175
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Apr 13 22:37:20 2008 +0200

    module has same precedence as multiply and divide
    
    eewwwww

diff --git a/vivified/code/vivi_code_defaults.h b/vivified/code/vivi_code_defaults.h
index c6d3d45..f18b2ce 100644
--- a/vivified/code/vivi_code_defaults.h
+++ b/vivified/code/vivi_code_defaults.h
@@ -25,7 +25,7 @@ DEFAULT_BINARY (Add,		add,		"add",	SWFDEC_AS_ACTION_ADD,		VIVI_PRECEDENCE_ADD)
 DEFAULT_BINARY (Subtract,	subtract,	"-",	SWFDEC_AS_ACTION_SUBTRACT,	VIVI_PRECEDENCE_ADD)
 DEFAULT_BINARY (Multiply,	multiply,	"*",	SWFDEC_AS_ACTION_MULTIPLY,	VIVI_PRECEDENCE_MULTIPLY)
 DEFAULT_BINARY (Divide,		divide,		"/",	SWFDEC_AS_ACTION_DIVIDE,	VIVI_PRECEDENCE_MULTIPLY)
-DEFAULT_BINARY (Modulo,		modulo,		"%",	SWFDEC_AS_ACTION_MODULO,	VIVI_PRECEDENCE_MODULO)
+DEFAULT_BINARY (Modulo,		modulo,		"%",	SWFDEC_AS_ACTION_MODULO,	VIVI_PRECEDENCE_MULTIPLY)
 DEFAULT_BINARY (Equals,		equals,		"==",	SWFDEC_AS_ACTION_EQUALS,	VIVI_PRECEDENCE_EQUALITY)
 DEFAULT_BINARY (Less,		less,		"<",	SWFDEC_AS_ACTION_LESS,		VIVI_PRECEDENCE_RELATIONAL)
 DEFAULT_BINARY (LogicalAnd,	logical_and,	"and",	SWFDEC_AS_ACTION_AND,		VIVI_PRECEDENCE_AND)
diff --git a/vivified/code/vivi_code_value.h b/vivified/code/vivi_code_value.h
index 61ea81a..ae66a9c 100644
--- a/vivified/code/vivi_code_value.h
+++ b/vivified/code/vivi_code_value.h
@@ -38,7 +38,6 @@ typedef enum {
   VIVI_PRECEDENCE_RELATIONAL,
   VIVI_PRECEDENCE_SHIFT,
   VIVI_PRECEDENCE_ADD,
-  VIVI_PRECEDENCE_MODULO,
   VIVI_PRECEDENCE_MULTIPLY,
   VIVI_PRECEDENCE_UNARY,
   VIVI_PRECEDENCE_INCREMENT,
commit 03f101387651afb5168d898eb4301cb81a48aaea
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Apr 13 22:36:35 2008 +0200

    no more auto backend, use explicit defines
    
    alsa is default now.
    for pulse audio you need to specify --with-audio=pulse
    for no audio, --with-audio=none

diff --git a/configure.ac b/configure.ac
index ec29c0d..4711f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,15 +137,14 @@ dnl
 dnl audio backend
 dnl
 AC_ARG_WITH(audio,
-            [AC_HELP_STRING([--with-audio=@<:@auto/alsa/none@:>@],
+            [AC_HELP_STRING([--with-audio=@<:@auto/pulse/none@:>@],
                             [audio backend to use])],,
-	    [with_audio=auto])
+	    [with_audio=alsa])
 
 AUDIO_TYPE=
-if test "$with_audio" = "auto" -o "$with_audio" = "alsa"; then
+if test "$with_audio" = "alsa"; then
   PKG_CHECK_MODULES(ALSA, alsa >= 1.0, AUDIO_TYPE=alsa)
   if test "$AUDIO_TYPE" = "alsa"; then
-    with_audio=alsa
     AUDIO_CFLAGS=$ALSA_CFLAGS
     AUDIO_LIBS=$ALSA_LIBS
   else
@@ -159,14 +158,13 @@ fi
 
 dnl Use PA if ALSA wasn't found and we're auto and it's available.
 dnl Disabled for now until the PA backend works.
-if test "$with_audio" = "auto" -o "$with_audio" = "pa"; then
-  PKG_CHECK_MODULES(PA, libpulse-mainloop-glib, AUDIO_TYPE=pa)
-  if test "$AUDIO_TYPE" = "pa"; then
-    with_audio=pa
+if test "$with_audio" = "pulse"; then
+  PKG_CHECK_MODULES(PA, libpulse-mainloop-glib, AUDIO_TYPE="pulse")
+  if test "$AUDIO_TYPE" = "pulse"; then
     AUDIO_CFLAGS=$PA_CFLAGS
     AUDIO_LIBS=$PA_LIBS
   else
-    if test "$with_audio" = "pa"; then
+    if test "$with_audio" = "pulse"; then
       AC_MSG_ERROR([no pulseaudio support])
     else
       AC_MSG_WARN([no pulseaudio support])
@@ -175,14 +173,14 @@ if test "$with_audio" = "auto" -o "$with_audio" = "pa"; then
 fi
 
 dnl If all else fails, fall back to none.
-if test "$with_audio" = "auto" -o "$with_audio" = "none"; then
+if test "$with_audio" = "none"; then
   AUDIO_CFLAGS=
   AUDIO_LIBS=
   AUDIO_TYPE=none
 fi
 
 if test "x$AUDIO_TYPE" = "x"; then
-  AC_MSG_ERROR([desired audio support could not be used])
+  AC_MSG_ERROR([audio backend "$with_audio" could not be used])
 else
   AC_MSG_NOTICE([audio backend: $AUDIO_TYPE])
 fi