Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 28

LiVES.changes Changed

LiVES.spec Changed

LiVES-2.4.2.tar.bz2/ChangeLog -> LiVES-2.4.3.tar.bz2/ChangeLog Changed

LiVES-2.4.2.tar.bz2/LiVES.doxygen -> LiVES-2.4.3.tar.bz2/LiVES.doxygen Changed

LiVES-2.4.2.tar.bz2/README -> LiVES-2.4.3.tar.bz2/README Changed

LiVES-2.4.2.tar.bz2/build-lives-rfx-plugin -> LiVES-2.4.3.tar.bz2/build-lives-rfx-plugin Changed

LiVES-2.4.2.tar.bz2/configure -> LiVES-2.4.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LiVES 2.4.2.
+# Generated by GNU Autoconf 2.69 for LiVES 2.4.3.
 #
 # Report bugs to <https://sourceforge.net/p/lives/bugs/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='LiVES'
 PACKAGE_TARNAME='lives'
-PACKAGE_VERSION='2.4.2'
-PACKAGE_STRING='LiVES 2.4.2'
+PACKAGE_VERSION='2.4.3'
+PACKAGE_STRING='LiVES 2.4.3'
 PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/'
 PACKAGE_URL=''
 
@@ -1699,7 +1699,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LiVES 2.4.2 to adapt to many kinds of systems.
+\`configure' configures LiVES 2.4.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1770,7 +1770,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LiVES 2.4.2:";;
+     short | recursive ) echo "Configuration of LiVES 2.4.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2028,7 +2028,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LiVES configure 2.4.2
+LiVES configure 2.4.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2755,7 +2755,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LiVES $as_me 2.4.2, which was
+It was created by LiVES $as_me 2.4.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3736,7 +3736,7 @@
 
 # Define the identity of the package.
  PACKAGE='lives'
- VERSION='2.4.2'
+ VERSION='2.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29548,7 +29548,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LiVES $as_me 2.4.2, which was
+This file was extended by LiVES $as_me 2.4.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29605,7 +29605,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LiVES config.status 2.4.2
+LiVES config.status 2.4.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

LiVES-2.4.2.tar.bz2/configure.ac -> LiVES-2.4.3.tar.bz2/configure.ac Changed

LiVES-2.4.2.tar.bz2/intl/bindtextdom.c -> LiVES-2.4.3.tar.bz2/intl/bindtextdom.c Changed

@@ -49,7 +49,7 @@
 /* @@ end of prolog @@ */
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
+gl_rwlock_define(extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -74,267 +74,236 @@
    If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
    modified nor returned.  */
 static void
-set_binding_values (const char *domainname,
-		    const char **dirnamep, const char **codesetp)
-{
+set_binding_values(const char *domainname,
+                   const char **dirnamep, const char **codesetp) {
   struct binding *binding;
   int modified;
 
   /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
+  if (domainname == NULL || domainname[0] == '\0') {
+    if (dirnamep)
+      *dirnamep = NULL;
+    if (codesetp)
+      *codesetp = NULL;
+    return;
+  }
 
-  gl_rwlock_wrlock (_nl_state_lock);
+  gl_rwlock_wrlock(_nl_state_lock);
 
   modified = 0;
 
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) {
+    int compare = strcmp(domainname, binding->domainname);
+    if (compare == 0)
+      /* We found it!  */
+      break;
+    if (compare < 0) {
+      /* It is not in the list.  */
+      binding = NULL;
+      break;
     }
-
-  if (binding != NULL)
-    {
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
+  }
+
+  if (binding != NULL) {
+    if (dirnamep) {
+      const char *dirname = *dirnamep;
+
+      if (dirname == NULL)
+        /* The current binding has be to returned.  */
+        *dirnamep = binding->dirname;
+      else {
+        /* The domain is already bound.  If the new value and the old
+        one are equal we simply do nothing.  Otherwise replace the
+        old binding.  */
+        char *result = binding->dirname;
+        if (strcmp(dirname, result) != 0) {
+          if (strcmp(dirname, _nl_default_dirname) == 0)
+            result = (char *) _nl_default_dirname;
+          else {
 #if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
+            result = strdup(dirname);
 #else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
+            size_t len = strlen(dirname) + 1;
+            result = (char *) malloc(len);
+            if (__builtin_expect(result != NULL, 1))
+              memcpy(result, dirname, len);
 #endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
-	    }
-	}
+          }
+
+          if (__builtin_expect(result != NULL, 1)) {
+            if (binding->dirname != _nl_default_dirname)
+              free(binding->dirname);
+
+            binding->dirname = result;
+            modified = 1;
+          }
+        }
+        *dirnamep = result;
+      }
+    }
 
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
+    if (codesetp) {
+      const char *codeset = *codesetp;
+
+      if (codeset == NULL)
+        /* The current binding has be to returned.  */
+        *codesetp = binding->codeset;
+      else {
+        /* The domain is already bound.  If the new value and the old
+        one are equal we simply do nothing.  Otherwise replace the
+        old binding.  */
+        char *result = binding->codeset;
+        if (result == NULL || strcmp(codeset, result) != 0) {
 #if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
+          result = strdup(codeset);
 #else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
+          size_t len = strlen(codeset) + 1;
+          result = (char *) malloc(len);
+          if (__builtin_expect(result != NULL, 1))
+            memcpy(result, codeset, len);
 #endif
 
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }

LiVES-2.4.2.tar.bz2/intl/dcgettext.c -> LiVES-2.4.3.tar.bz2/intl/dcgettext.c Changed

LiVES-2.4.2.tar.bz2/intl/dcigettext.c -> LiVES-2.4.3.tar.bz2/intl/dcigettext.c Changed

@@ -44,10 +44,10 @@
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
- #pragma alloca
+#pragma alloca
 #   else
 #    ifndef alloca
-char *alloca ();
+char *alloca();
 #    endif
 #   endif
 #  endif
@@ -73,8 +73,8 @@
 #include <locale.h>
 
 #ifdef _LIBC
-  /* Guess whether integer division by zero raises signal SIGFPE.
-     Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
+/* Guess whether integer division by zero raises signal SIGFPE.
+   Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
 # if defined __alpha__ || defined __arm__ || defined __i386__ \
      || defined __m68k__ || defined __s390__
 #  define INTDIV0_RAISES_SIGFPE 1
@@ -146,20 +146,20 @@
 # define tfind __tfind
 #else
 # if !defined HAVE_GETCWD
-char *getwd ();
+char *getwd();
 #  define getcwd(buf, max) getwd (buf)
 # else
 #  if VMS
 #   define getcwd(buf, max) (getcwd) (buf, max, 0)
 #  else
-char *getcwd ();
+char *getcwd();
 #  endif
 # endif
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+static char *stpcpy(char *dest, const char *src);
 # endif
 # ifndef HAVE_MEMPCPY
-static void *mempcpy (void *dest, const void *src, size_t n);
+static void *mempcpy(void *dest, const void *src, size_t n);
 # endif
 #endif
 
@@ -218,7 +218,7 @@
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+/* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -227,7 +227,7 @@
 # define IS_PATH_WITH_DIR(P) \
     (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
 #else
-  /* Unix */
+/* Unix */
 # define ISSLASH(C) ((C) == '/')
 # define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
@@ -240,8 +240,7 @@
 
 /* This is the type used for the search tree where known translations
    are stored.  */
-struct known_translation_t
-{
+struct known_translation_t {
   /* Domain in which to search.  */
   const char *domainname;
 
@@ -272,15 +271,14 @@
   char msgid[ZERO];
 };
 
-gl_rwlock_define_initialized (static, tree_lock)
+gl_rwlock_define_initialized(static, tree_lock)
 
 /* Root of the search tree with known translations.  */
 static void *root;
 
 /* Function to compare two entries in the table of known translations.  */
 static int
-transcmp (const void *p1, const void *p2)
-{
+transcmp(const void *p1, const void *p2) {
   const struct known_translation_t *s1;
   const struct known_translation_t *s2;
   int result;
@@ -288,28 +286,26 @@
   s1 = (const struct known_translation_t *) p1;
   s2 = (const struct known_translation_t *) p2;
 
-  result = strcmp (s1->msgid, s2->msgid);
-  if (result == 0)
-    {
-      result = strcmp (s1->domainname, s2->domainname);
-      if (result == 0)
-	{
+  result = strcmp(s1->msgid, s2->msgid);
+  if (result == 0) {
+    result = strcmp(s1->domainname, s2->domainname);
+    if (result == 0) {
 #ifdef HAVE_PER_THREAD_LOCALE
-	  result = strcmp (s1->localename, s2->localename);
-	  if (result == 0)
+      result = strcmp(s1->localename, s2->localename);
+      if (result == 0)
 #endif
-	    {
+      {
 #ifdef IN_LIBGLOCALE
-	      result = strcmp (s1->encoding, s2->encoding);
-	      if (result == 0)
-#endif
-		/* We compare the category last (though this is the cheapest
-		   operation) since it is hopefully always the same (namely
-		   LC_MESSAGES).  */
-		result = s1->category - s2->category;
-	    }
-	}
+        result = strcmp(s1->encoding, s2->encoding);
+        if (result == 0)
+#endif
+          /* We compare the category last (though this is the cheapest
+             operation) since it is hopefully always the same (namely
+             LC_MESSAGES).  */
+          result = s1->category - s2->category;
+      }
     }
+  }
 
   return result;
 }
@@ -321,7 +317,7 @@
 #ifndef IN_LIBGLOCALE
 /* Value used as the default domain for gettext(3).  */
 const char *_nl_current_default_domain attribute_hidden
-     = _nl_default_default_domain;
+  = _nl_default_default_domain;
 #endif
 
 /* Contains the default location of the message catalogs.  */
@@ -330,11 +326,11 @@
 #else
 # ifdef _LIBC
 extern const char _nl_default_dirname[];
-libc_hidden_proto (_nl_default_dirname)
+libc_hidden_proto(_nl_default_dirname)
 # endif
 const char _nl_default_dirname[] = LOCALEDIR;
 # ifdef _LIBC
-libc_hidden_data_def (_nl_default_dirname)
+libc_hidden_data_def(_nl_default_dirname)
 # endif
 #endif
 
@@ -345,20 +341,20 @@
 #endif
 
 /* Prototypes for local functions.  */
-static char *plural_lookup (struct loaded_l10nfile *domain,
-			    unsigned long int n,
-			    const char *translation, size_t translation_len)
-     internal_function;
+static char *plural_lookup(struct loaded_l10nfile *domain,
+                           unsigned long int n,
+                           const char *translation, size_t translation_len)
+internal_function;
 
 #ifdef IN_LIBGLOCALE
-static const char *guess_category_value (int category,
-					 const char *categoryname,
-					 const char *localename)
-     internal_function;
+static const char *guess_category_value(int category,
+                                        const char *categoryname,
+                                        const char *localename)
+internal_function;
 #else
-static const char *guess_category_value (int category,
-					 const char *categoryname)
-     internal_function;
+static const char *guess_category_value(int category,
+                                        const char *categoryname)
+internal_function;
 #endif
 
 #ifdef _LIBC
@@ -366,11 +362,11 @@
 # define category_to_name(category) \
   _nl_category_names.str + _nl_category_name_idxs[category]
 #else
-static const char *category_to_name (int category) internal_function;

LiVES-2.4.2.tar.bz2/intl/dcngettext.c -> LiVES-2.4.3.tar.bz2/intl/dcngettext.c Changed

LiVES-2.4.2.tar.bz2/intl/dgettext.c -> LiVES-2.4.3.tar.bz2/intl/dgettext.c Changed

LiVES-2.4.2.tar.bz2/intl/dngettext.c -> LiVES-2.4.3.tar.bz2/intl/dngettext.c Changed

LiVES-2.4.2.tar.bz2/intl/eval-plural.h -> LiVES-2.4.3.tar.bz2/intl/eval-plural.h Changed

@@ -24,85 +24,77 @@
 STATIC
 unsigned long int
 internal_function
-plural_eval (const struct expression *pexp, unsigned long int n)
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
+plural_eval(const struct expression *pexp, unsigned long int n) {
+  switch (pexp->nargs) {
+  case 0:
+    switch (pexp->operation) {
+    case var:
+      return n;
+    case num:
+      return pexp->val.num;
+    default:
       break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
+    }
+    /* NOTREACHED */
+    break;
+  case 1: {
+    /* pexp->operation must be lnot.  */
+    unsigned long int arg = plural_eval(pexp->val.args[0], n);
+    return ! arg;
+  }
+  case 2: {
+    unsigned long int leftarg = plural_eval(pexp->val.args[0], n);
+    if (pexp->operation == lor)
+      return leftarg || plural_eval(pexp->val.args[1], n);
+    else if (pexp->operation == land)
+      return leftarg && plural_eval(pexp->val.args[1], n);
+    else {
+      unsigned long int rightarg = plural_eval(pexp->val.args[1], n);
 
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
+      switch (pexp->operation) {
+      case mult:
+        return leftarg * rightarg;
+      case divide:
 #if !INTDIV0_RAISES_SIGFPE
-		if (rightarg == 0)
-		  raise (SIGFPE);
+        if (rightarg == 0)
+          raise(SIGFPE);
 #endif
-		return leftarg / rightarg;
-	      case module:
+        return leftarg / rightarg;
+      case module:
 #if !INTDIV0_RAISES_SIGFPE
-		if (rightarg == 0)
-		  raise (SIGFPE);
+        if (rightarg == 0)
+          raise(SIGFPE);
 #endif
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
+        return leftarg % rightarg;
+      case plus:
+        return leftarg + rightarg;
+      case minus:
+        return leftarg - rightarg;
+      case less_than:
+        return leftarg < rightarg;
+      case greater_than:
+        return leftarg > rightarg;
+      case less_or_equal:
+        return leftarg <= rightarg;
+      case greater_or_equal:
+        return leftarg >= rightarg;
+      case equal:
+        return leftarg == rightarg;
+      case not_equal:
+        return leftarg != rightarg;
+      default:
+        break;
       }
     }
+    /* NOTREACHED */
+    break;
+  }
+  case 3: {
+    /* pexp->operation must be qmop.  */
+    unsigned long int boolarg = plural_eval(pexp->val.args[0], n);
+    return plural_eval(pexp->val.args[boolarg ? 1 : 2], n);
+  }
+  }
   /* NOTREACHED */
   return 0;
 }

LiVES-2.4.2.tar.bz2/intl/explodename.c -> LiVES-2.4.3.tar.bz2/intl/explodename.c Changed

@@ -40,11 +40,10 @@
 /* Split a locale name NAME into a leading language part and all the
    rest.  Return a pointer to the first character after the language,
    i.e. to the first byte of the rest.  */
-static char *_nl_find_language (const char *name);
+static char *_nl_find_language(const char *name);
 
 static char *
-_nl_find_language (const char *name)
-{
+_nl_find_language(const char *name) {
   while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
     ++name;
 
@@ -53,11 +52,10 @@
 
 
 int
-_nl_explode_name (char *name,
-		  const char **language, const char **modifier,
-		  const char **territory, const char **codeset,
-		  const char **normalized_codeset)
-{
+_nl_explode_name(char *name,
+                 const char **language, const char **modifier,
+                 const char **territory, const char **codeset,
+                 const char **normalized_codeset) {
   char *cp;
   int mask;
 
@@ -70,60 +68,55 @@
      look for the language.  Termination symbols are `_', '.', and `@'.  */
   mask = 0;
   *language = cp = name;
-  cp = _nl_find_language (*language);
+  cp = _nl_find_language(*language);
 
   if (*language == cp)
     /* This does not make sense: language has to be specified.  Use
        this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else
-    {
-      if (cp[0] == '_')
-	{
-	  /* Next is the territory.  */
-	  cp[0] = '\0';
-	  *territory = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_TERRITORY;
-	}
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (*normalized_codeset == NULL)
-		return -1;
-	      else if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
+    cp = strchr(*language, '\0');
+  else {
+    if (cp[0] == '_') {
+      /* Next is the territory.  */
+      cp[0] = '\0';
+      *territory = ++cp;
+
+      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
+        ++cp;
+
+      mask |= XPG_TERRITORY;
     }
 
-  if (cp[0] == '@')
-    {
-      /* Next is the modifier.  */
+    if (cp[0] == '.') {
+      /* Next is the codeset.  */
       cp[0] = '\0';
-      *modifier = ++cp;
-
-      if (cp[0] != '\0')
-	mask |= XPG_MODIFIER;
+      *codeset = ++cp;
+
+      while (cp[0] != '\0' && cp[0] != '@')
+        ++cp;
+
+      mask |= XPG_CODESET;
+
+      if (*codeset != cp && (*codeset)[0] != '\0') {
+        *normalized_codeset = _nl_normalize_codeset(*codeset,
+                              cp - *codeset);
+        if (*normalized_codeset == NULL)
+          return -1;
+        else if (strcmp(*codeset, *normalized_codeset) == 0)
+          free((char *) *normalized_codeset);
+        else
+          mask |= XPG_NORM_CODESET;
+      }
     }
+  }
+
+  if (cp[0] == '@') {
+    /* Next is the modifier.  */
+    cp[0] = '\0';
+    *modifier = ++cp;
+
+    if (cp[0] != '\0')
+      mask |= XPG_MODIFIER;
+  }
 
   if (*territory != NULL && (*territory)[0] == '\0')
     mask &= ~XPG_TERRITORY;

LiVES-2.4.2.tar.bz2/intl/finddomain.c -> LiVES-2.4.3.tar.bz2/intl/finddomain.c Changed

@@ -57,10 +57,9 @@
    the DOMAINNAME and CATEGORY parameters with respect to the currently
    established bindings.  */
 struct loaded_l10nfile *
-internal_function
-_nl_find_domain (const char *dirname, char *locale,
-		 const char *domainname, struct binding *domainbinding)
-{
+    internal_function
+_nl_find_domain(const char *dirname, char *locale,
+                const char *domainname, struct binding *domainbinding) {
   struct loaded_l10nfile *retval;
   const char *language;
   const char *modifier;
@@ -72,120 +71,115 @@
 
   /* LOCALE can consist of up to four recognized parts for the XPG syntax:
 
-		language[_territory][.codeset][@modifier]
+  	language[_territory][.codeset][@modifier]
 
      Beside the first part all of them are allowed to be missing.  If
      the full specified locale is not found, the less specific one are
      looked for.  The various parts will be stripped off according to
      the following order:
-		(1) codeset
-		(2) normalized codeset
-		(3) territory
-		(4) modifier
+  	(1) codeset
+  	(2) normalized codeset
+  	(3) territory
+  	(4) modifier
    */
 
   /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
-  gl_rwlock_define_initialized (static, lock);
-  gl_rwlock_rdlock (lock);
+  gl_rwlock_define_initialized(static, lock);
+  gl_rwlock_rdlock(lock);
 
   /* If we have already tested for this locale entry there has to
      be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, domainname, 0);
+  retval = _nl_make_l10nflist(&_nl_loaded_domains, dirname,
+                              strlen(dirname) + 1, 0, locale, NULL, NULL,
+                              NULL, NULL, domainname, 0);
 
-  gl_rwlock_unlock (lock);
+  gl_rwlock_unlock(lock);
 
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
+  if (retval != NULL) {
+    /* We know something about this locale.  */
+    int cnt;
 
-      if (retval->decided <= 0)
-	_nl_load_domain (retval, domainbinding);
+    if (retval->decided <= 0)
+      _nl_load_domain(retval, domainbinding);
 
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided <= 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
+    if (retval->data != NULL)
+      return retval;
 
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
+    for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) {
+      if (retval->successor[cnt]->decided <= 0)
+        _nl_load_domain(retval->successor[cnt], domainbinding);
 
-      return retval;
-      /* NOTREACHED */
+      if (retval->successor[cnt]->data != NULL)
+        break;
     }
 
+    return retval;
+    /* NOTREACHED */
+  }
+
   /* See whether the locale value is an alias.  If yes its value
      *overwrites* the alias name.  No test for the original value is
      done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
+  alias_value = _nl_expand_alias(locale);
+  if (alias_value != NULL) {
 #if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
+    locale = strdup(alias_value);
+    if (locale == NULL)
+      return NULL;
 #else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
+    size_t len = strlen(alias_value) + 1;
+    locale = (char *) malloc(len);
+    if (locale == NULL)
+      return NULL;
 
-      memcpy (locale, alias_value, len);
+    memcpy(locale, alias_value, len);
 #endif
-    }
+  }
 
   /* Now we determine the single parts of the locale name.  First
      look for the language.  Termination symbols are `_', '.', and `@'.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset);
+  mask = _nl_explode_name(locale, &language, &modifier, &territory,
+                          &codeset, &normalized_codeset);
   if (mask == -1)
     /* This means we are out of core.  */
     return NULL;
 
   /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
-  gl_rwlock_wrlock (lock);
+  gl_rwlock_wrlock(lock);
 
   /* Create all possible locale entries which might be interested in
      generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier,
-			       domainname, 1);
+  retval = _nl_make_l10nflist(&_nl_loaded_domains, dirname,
+                              strlen(dirname) + 1, mask, language, territory,
+                              codeset, normalized_codeset, modifier,
+                              domainname, 1);
 
-  gl_rwlock_unlock (lock);
+  gl_rwlock_unlock(lock);
 
   if (retval == NULL)
     /* This means we are out of core.  */
     goto out;
 
   if (retval->decided <= 0)
-    _nl_load_domain (retval, domainbinding);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided <= 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
+    _nl_load_domain(retval, domainbinding);
+  if (retval->data == NULL) {
+    int cnt;
+    for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) {
+      if (retval->successor[cnt]->decided <= 0)
+        _nl_load_domain(retval->successor[cnt], domainbinding);
+      if (retval->successor[cnt]->data != NULL)
+        break;
     }
+  }
 
   /* The room for an alias was dynamically allocated.  Free it now.  */
   if (alias_value != NULL)
-    free (locale);
+    free(locale);
 
 out:
   /* The space for normalized_codeset is dynamically allocated.  Free it.  */
   if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
+    free((void *) normalized_codeset);
 
   return retval;
 }
@@ -195,18 +189,16 @@
 /* This is called from iconv/gconv_db.c's free_mem, as locales must
    be freed before freeing gconv steps arrays.  */
 void __libc_freeres_fn_section
-_nl_finddomain_subfreeres ()
-{
+_nl_finddomain_subfreeres() {
   struct loaded_l10nfile *runp = _nl_loaded_domains;

LiVES-2.4.2.tar.bz2/intl/gettext.c -> LiVES-2.4.3.tar.bz2/intl/gettext.c Changed

LiVES-2.4.2.tar.bz2/intl/gettextP.h -> LiVES-2.4.3.tar.bz2/intl/gettextP.h Changed

@@ -39,30 +39,30 @@
 #endif
 
 #ifdef _LIBC
-extern char *__gettext (const char *__msgid);
-extern char *__dgettext (const char *__domainname, const char *__msgid);
-extern char *__dcgettext (const char *__domainname, const char *__msgid,
-			  int __category);
-extern char *__ngettext (const char *__msgid1, const char *__msgid2,
-			 unsigned long int __n);
-extern char *__dngettext (const char *__domainname,
-			  const char *__msgid1, const char *__msgid2,
-			  unsigned long int n);
-extern char *__dcngettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   unsigned long int __n, int __category);
-extern char *__dcigettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   int __plural, unsigned long int __n,
-			   int __category);
-extern char *__textdomain (const char *__domainname);
-extern char *__bindtextdomain (const char *__domainname,
-			       const char *__dirname);
-extern char *__bind_textdomain_codeset (const char *__domainname,
-					const char *__codeset);
-extern void _nl_finddomain_subfreeres (void) attribute_hidden;
-extern void _nl_unload_domain (struct loaded_domain *__domain)
-     internal_function attribute_hidden;
+extern char *__gettext(const char *__msgid);
+extern char *__dgettext(const char *__domainname, const char *__msgid);
+extern char *__dcgettext(const char *__domainname, const char *__msgid,
+                         int __category);
+extern char *__ngettext(const char *__msgid1, const char *__msgid2,
+                        unsigned long int __n);
+extern char *__dngettext(const char *__domainname,
+                         const char *__msgid1, const char *__msgid2,
+                         unsigned long int n);
+extern char *__dcngettext(const char *__domainname,
+                          const char *__msgid1, const char *__msgid2,
+                          unsigned long int __n, int __category);
+extern char *__dcigettext(const char *__domainname,
+                          const char *__msgid1, const char *__msgid2,
+                          int __plural, unsigned long int __n,
+                          int __category);
+extern char *__textdomain(const char *__domainname);
+extern char *__bindtextdomain(const char *__domainname,
+                              const char *__dirname);
+extern char *__bind_textdomain_codeset(const char *__domainname,
+                                       const char *__codeset);
+extern void _nl_finddomain_subfreeres(void) attribute_hidden;
+extern void _nl_unload_domain(struct loaded_domain *__domain)
+internal_function attribute_hidden;
 #else
 /* Declare the exported libintl_* functions, in a way that allows us to
    call them under their real name.  */
@@ -71,16 +71,16 @@
 # define _INTL_REDIRECT_MACROS
 # include "libgnuintl.h"
 # ifdef IN_LIBGLOCALE
-extern char *gl_dcigettext (const char *__domainname,
-			    const char *__msgid1, const char *__msgid2,
-			    int __plural, unsigned long int __n,
-			    int __category,
-			    const char *__localename, const char *__encoding);
+extern char *gl_dcigettext(const char *__domainname,
+                           const char *__msgid1, const char *__msgid2,
+                           int __plural, unsigned long int __n,
+                           int __category,
+                           const char *__localename, const char *__encoding);
 # else
-extern char *libintl_dcigettext (const char *__domainname,
-				 const char *__msgid1, const char *__msgid2,
-				 int __plural, unsigned long int __n,
-				 int __category);
+extern char *libintl_dcigettext(const char *__domainname,
+                                const char *__msgid1, const char *__msgid2,
+                                int __plural, unsigned long int __n,
+                                int __category);
 # endif
 #endif
 
@@ -115,10 +115,10 @@
 #else
 static inline nls_uint32
 # ifdef __cplusplus
-SWAP (nls_uint32 i)
+SWAP(nls_uint32 i)
 # else
-SWAP (i)
-     nls_uint32 i;
+SWAP(i)
+nls_uint32 i;
 # endif
 {
   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
@@ -127,8 +127,7 @@
 
 
 /* In-memory representation of system dependent string.  */
-struct sysdep_string_desc
-{
+struct sysdep_string_desc {
   /* Length of addressed string, including the trailing NUL.  */
   size_t length;
   /* Pointer to addressed string.  */
@@ -138,8 +137,7 @@
 /* Cache of translated strings after charset conversion.
    Note: The strings are converted to the target encoding only on an as-needed
    basis.  */
-struct converted_domain
-{
+struct converted_domain {
   /* The target encoding name.  */
   const char *encoding;
   /* The descriptor for conversion from the message catalog's encoding to
@@ -156,8 +154,7 @@
 };
 
 /* The representation of an opened message catalog.  */
-struct loaded_domain
-{
+struct loaded_domain {
   /* Pointer to memory containing the .mo file.  */
   const char *data;
   /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed.  */
@@ -193,7 +190,7 @@
   /* Cache of charset conversions of the translated strings.  */
   struct converted_domain *conversions;
   size_t nconversions;
-  gl_rwlock_define (, conversions_lock)
+  gl_rwlock_define(, conversions_lock)
 
   const struct expression *plural;
   unsigned long int nplurals;
@@ -209,8 +206,7 @@
 
 /* A set of settings bound to a message domain.  Used to store settings
    from bindtextdomain() and bind_textdomain_codeset().  */
-struct binding
-{
+struct binding {
   struct binding *next;
   char *dirname;
   char *codeset;
@@ -228,37 +224,37 @@
 #endif
 
 #ifndef _LIBC
-extern const char *_nl_language_preferences_default (void);
+extern const char *_nl_language_preferences_default(void);
 # define gl_locale_name_canonicalize _nl_locale_name_canonicalize
-extern void _nl_locale_name_canonicalize (char *name);
+extern void _nl_locale_name_canonicalize(char *name);
 # define gl_locale_name_posix _nl_locale_name_posix
-extern const char *_nl_locale_name_posix (int category,
-					  const char *categoryname);
+extern const char *_nl_locale_name_posix(int category,
+    const char *categoryname);
 # define gl_locale_name_default _nl_locale_name_default
-extern const char *_nl_locale_name_default (void);
+extern const char *_nl_locale_name_default(void);
 # define gl_locale_name _nl_locale_name
-extern const char *_nl_locale_name (int category, const char *categoryname);
+extern const char *_nl_locale_name(int category, const char *categoryname);
 #endif
 
-struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
-					 const char *__domainname,
-					 struct binding *__domainbinding)
-     internal_function;
-void _nl_load_domain (struct loaded_l10nfile *__domain,
-		      struct binding *__domainbinding)
-     internal_function;
+struct loaded_l10nfile *_nl_find_domain(const char *__dirname, char *__locale,
+                                        const char *__domainname,
+                                        struct binding *__domainbinding)
+internal_function;
+void _nl_load_domain(struct loaded_l10nfile *__domain,
+                     struct binding *__domainbinding)
+internal_function;
 
 #ifdef IN_LIBGLOCALE
-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
-		    struct binding *domainbinding, const char *encoding,
-		    const char *msgid,
-		    size_t *lengthp)
-     internal_function;
+char *_nl_find_msg(struct loaded_l10nfile *domain_file,
+                   struct binding *domainbinding, const char *encoding,
+                   const char *msgid,
+                   size_t *lengthp)
+internal_function;
 #else
-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
-		    struct binding *domainbinding, const char *msgid,
-		    int convert, size_t *lengthp)
-     internal_function;
+char *_nl_find_msg(struct loaded_l10nfile *domain_file,
+                   struct binding *domainbinding, const char *msgid,
+                   int convert, size_t *lengthp)

LiVES-2.4.2.tar.bz2/intl/gmo.h -> LiVES-2.4.3.tar.bz2/intl/gmo.h Changed

@@ -61,17 +61,16 @@
 #  if ULONG_MAX == UINT_MAX_32_BITS
 typedef unsigned long nls_uint32;
 #  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
+/* The following line is intended to throw an error.  Using #error is
+   not portable enough.  */
+"Cannot determine unsigned 32-bit data type."
 #  endif
 # endif
 #endif
 
 
 /* Header for binary .mo file format.  */
-struct mo_file_header
-{
+struct mo_file_header {
   /* The magic number.  */
   nls_uint32 magic;
   /* The revision number of the file format.  */
@@ -105,8 +104,7 @@
 };
 
 /* Descriptor for static string contained in the binary .mo file.  */
-struct string_desc
-{
+struct string_desc {
   /* Length of addressed string, not including the trailing NUL.  */
   nls_uint32 length;
   /* Offset of string in file.  */
@@ -116,8 +114,7 @@
 /* The following are only used in .mo files with minor revision >= 1.  */
 
 /* Descriptor for system dependent string segment.  */
-struct sysdep_segment
-{
+struct sysdep_segment {
   /* Length of addressed string, including the trailing NUL.  */
   nls_uint32 length;
   /* Offset of string in file.  */
@@ -125,8 +122,7 @@
 };
 
 /* Pair of a static and a system dependent segment, in struct sysdep_string.  */
-struct segment_pair
-{
+struct segment_pair {
   /* Size of static segment.  */
   nls_uint32 segsize;
   /* Reference to system dependent string segment, or ~0 at the end.  */
@@ -134,8 +130,7 @@
 };
 
 /* Descriptor for system dependent string.  */
-struct sysdep_string
-{
+struct sysdep_string {
   /* Offset of static string segments in file.  */
   nls_uint32 offset;
   /* Alternating sequence of static and system dependent segments.

LiVES-2.4.2.tar.bz2/intl/hash-string.c -> LiVES-2.4.3.tar.bz2/intl/hash-string.c Changed

LiVES-2.4.2.tar.bz2/intl/hash-string.h -> LiVES-2.4.3.tar.bz2/intl/hash-string.h Changed

LiVES-2.4.2.tar.bz2/intl/intl-compat.c -> LiVES-2.4.3.tar.bz2/intl/intl-compat.c Changed

@@ -60,74 +60,65 @@
 
 DLL_EXPORTED
 char *
-gettext (const char *msgid)
-{
-  return libintl_gettext (msgid);
+gettext(const char *msgid) {
+  return libintl_gettext(msgid);
 }
 
 
 DLL_EXPORTED
 char *
-dgettext (const char *domainname, const char *msgid)
-{
-  return libintl_dgettext (domainname, msgid);
+dgettext(const char *domainname, const char *msgid) {
+  return libintl_dgettext(domainname, msgid);
 }
 
 
 DLL_EXPORTED
 char *
-dcgettext (const char *domainname, const char *msgid, int category)
-{
-  return libintl_dcgettext (domainname, msgid, category);
+dcgettext(const char *domainname, const char *msgid, int category) {
+  return libintl_dcgettext(domainname, msgid, category);
 }
 
 
 DLL_EXPORTED
 char *
-ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return libintl_ngettext (msgid1, msgid2, n);
+ngettext(const char *msgid1, const char *msgid2, unsigned long int n) {
+  return libintl_ngettext(msgid1, msgid2, n);
 }
 
 
 DLL_EXPORTED
 char *
-dngettext (const char *domainname,
-	   const char *msgid1, const char *msgid2, unsigned long int n)
-{
-  return libintl_dngettext (domainname, msgid1, msgid2, n);
+dngettext(const char *domainname,
+          const char *msgid1, const char *msgid2, unsigned long int n) {
+  return libintl_dngettext(domainname, msgid1, msgid2, n);
 }
 
 
 DLL_EXPORTED
 char *
-dcngettext (const char *domainname,
-	    const char *msgid1, const char *msgid2, unsigned long int n,
-	    int category)
-{
-  return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
+dcngettext(const char *domainname,
+           const char *msgid1, const char *msgid2, unsigned long int n,
+           int category) {
+  return libintl_dcngettext(domainname, msgid1, msgid2, n, category);
 }
 
 
 DLL_EXPORTED
 char *
-textdomain (const char *domainname)
-{
-  return libintl_textdomain (domainname);
+textdomain(const char *domainname) {
+  return libintl_textdomain(domainname);
 }
 
 
 DLL_EXPORTED
 char *
-bindtextdomain (const char *domainname, const char *dirname)
-{
-  return libintl_bindtextdomain (domainname, dirname);
+bindtextdomain(const char *domainname, const char *dirname) {
+  return libintl_bindtextdomain(domainname, dirname);
 }
 
 
 DLL_EXPORTED
 char *
-bind_textdomain_codeset (const char *domainname, const char *codeset)
-{
-  return libintl_bind_textdomain_codeset (domainname, codeset);
+bind_textdomain_codeset(const char *domainname, const char *codeset) {
+  return libintl_bind_textdomain_codeset(domainname, codeset);
 }

LiVES-2.4.2.tar.bz2/intl/intl-exports.c -> LiVES-2.4.3.tar.bz2/intl/intl-exports.c Changed

LiVES-2.4.2.tar.bz2/intl/l10nflist.c -> LiVES-2.4.3.tar.bz2/intl/l10nflist.c Changed

@@ -58,7 +58,7 @@
 # endif
 #else
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+static char *stpcpy(char *dest, const char *src);
 # endif
 #endif
 
@@ -68,14 +68,14 @@
                         it may be concatenated to a directory pathname.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+/* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
      && (P)[1] == ':')
 # define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
 #else
-  /* Unix */
+/* Unix */
 # define ISSLASH(C) ((C) == '/')
 # define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
 #endif
@@ -90,16 +90,14 @@
 #else
 /* Returns the number of strings in ARGZ.  */
 static size_t
-argz_count__ (const char *argz, size_t len)
-{
+argz_count__(const char *argz, size_t len) {
   size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
+  while (len > 0) {
+    size_t part_len = strlen(argz);
+    argz += part_len + 1;
+    len -= part_len + 1;
+    count++;
+  }
   return count;
 }
 # undef __argz_count
@@ -116,16 +114,14 @@
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
    except the last into the character SEP.  */
 static void
-argz_stringify__ (char *argz, size_t len, int sep)
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
+argz_stringify__(char *argz, size_t len, int sep) {
+  while (len > 0) {
+    size_t part_len = strlen(argz);
+    argz += part_len;
+    len -= part_len + 1;
+    if (len > 0)
+      *argz++ = sep;
+  }
 }
 # undef __argz_stringify
 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
@@ -137,20 +133,16 @@
 # define __argz_next argz_next
 #else
 static char *
-argz_next__ (char *argz, size_t argz_len, const char *entry)
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
+argz_next__(char *argz, size_t argz_len, const char *entry) {
+  if (entry) {
+    if (entry < argz + argz_len)
+      entry = strchr(entry, '\0') + 1;
+
+    return entry >= argz + argz_len ? NULL : (char *) entry;
+  } else if (argz_len > 0)
+    return argz;
   else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
+    return 0;
 }
 # undef __argz_next
 # define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
@@ -159,8 +151,7 @@
 
 /* Return number of bits set in X.  */
 static inline int
-pop (int x)
-{
+pop(int x) {
   /* We assume that no more than 16 bits are used.  */
   x = ((x & ~0x5555) >> 1) + (x & 0x5555);
   x = ((x & ~0x3333) >> 2) + (x & 0x3333);
@@ -172,13 +163,12 @@
 
 &#xc;
 struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
-		    const char *dirlist, size_t dirlist_len,
-		    int mask, const char *language, const char *territory,
-		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier,
-		    const char *filename, int do_allocate)
-{
+_nl_make_l10nflist(struct loaded_l10nfile **l10nfile_list,
+                   const char *dirlist, size_t dirlist_len,
+                   int mask, const char *language, const char *territory,
+                   const char *codeset, const char *normalized_codeset,
+                   const char *modifier,
+                   const char *filename, int do_allocate) {
   char *abs_filename;
   struct loaded_l10nfile **lastp;
   struct loaded_l10nfile *retval;
@@ -189,100 +179,91 @@
 
   /* If LANGUAGE contains an absolute directory specification, we ignore
      DIRLIST.  */
-  if (IS_ABSOLUTE_PATH (language))
+  if (IS_ABSOLUTE_PATH(language))
     dirlist_len = 0;
 
   /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & XPG_TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + ((mask & XPG_MODIFIER) != 0
-				     ? strlen (modifier) + 1 : 0)
-				  + 1 + strlen (filename) + 1);
+  abs_filename = (char *) malloc(dirlist_len
+                                 + strlen(language)
+                                 + ((mask & XPG_TERRITORY) != 0
+                                    ? strlen(territory) + 1 : 0)
+                                 + ((mask & XPG_CODESET) != 0
+                                    ? strlen(codeset) + 1 : 0)
+                                 + ((mask & XPG_NORM_CODESET) != 0
+                                    ? strlen(normalized_codeset) + 1 : 0)
+                                 + ((mask & XPG_MODIFIER) != 0
+                                    ? strlen(modifier) + 1 : 0)
+                                 + 1 + strlen(filename) + 1);
 
   if (abs_filename == NULL)
     return NULL;
 
   /* Construct file name.  */
   cp = abs_filename;
-  if (dirlist_len > 0)
-    {
-      memcpy (cp, dirlist, dirlist_len);
-      __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
-      cp += dirlist_len;
-      cp[-1] = '/';
-    }
-
-  cp = stpcpy (cp, language);
-
-  if ((mask & XPG_TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & XPG_MODIFIER) != 0)
-    {
-      *cp++ = '@';

LiVES-2.4.2.tar.bz2/intl/langprefs.c -> LiVES-2.4.3.tar.bz2/intl/langprefs.c Changed

@@ -30,7 +30,7 @@
 # include <CoreFoundation/CFPropertyList.h>
 # include <CoreFoundation/CFArray.h>
 # include <CoreFoundation/CFString.h>
-extern void _nl_locale_name_canonicalize (char *name);
+extern void _nl_locale_name_canonicalize(char *name);
 #endif
 
 /* Determine the user's language preferences, as a colon separated list of
@@ -41,86 +41,75 @@
    already taken into account by the caller.  */
 
 const char *
-_nl_language_preferences_default (void)
-{
+_nl_language_preferences_default(void) {
 #if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
   {
     /* Cache the preferences list, since CoreFoundation calls are expensive.  */
     static const char *cached_languages;
     static int cache_initialized;
 
-    if (!cache_initialized)
-      {
-	CFTypeRef preferences =
-	  CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
-				     kCFPreferencesCurrentApplication);
-	if (preferences != NULL
-	    && CFGetTypeID (preferences) == CFArrayGetTypeID ())
-	  {
-	    CFArrayRef prefArray = (CFArrayRef)preferences;
-	    int n = CFArrayGetCount (prefArray);
-	    char buf[256];
-	    size_t size = 0;
-	    int i;
+    if (!cache_initialized) {
+      CFTypeRef preferences =
+      CFPreferencesCopyAppValue(CFSTR("AppleLanguages"),
+      kCFPreferencesCurrentApplication);
+      if (preferences != NULL
+      && CFGetTypeID(preferences) == CFArrayGetTypeID()) {
+        CFArrayRef prefArray = (CFArrayRef)preferences;
+        int n = CFArrayGetCount(prefArray);
+        char buf[256];
+        size_t size = 0;
+        int i;
 
-	    for (i = 0; i < n; i++)
-	      {
-		CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
-		if (element != NULL
-		    && CFGetTypeID (element) == CFStringGetTypeID ()
-		    && CFStringGetCString ((CFStringRef)element,
-					   buf, sizeof (buf),
-					   kCFStringEncodingASCII))
-		  {
-		    _nl_locale_name_canonicalize (buf);
-		    size += strlen (buf) + 1;
-		    /* Most GNU programs use msgids in English and don't ship
-		       an en.mo message catalog.  Therefore when we see "en"
-		       in the preferences list, arrange for gettext() to
-		       return the msgid, and ignore all further elements of
-		       the preferences list.  */
-		    if (strcmp (buf, "en") == 0)
-		      break;
-		  }
-		else
-		  break;
-	      }
-	    if (size > 0)
-	      {
-		char *languages = (char *) malloc (size);
+        for (i = 0; i < n; i++) {
+          CFTypeRef element = CFArrayGetValueAtIndex(prefArray, i);
+          if (element != NULL
+          && CFGetTypeID(element) == CFStringGetTypeID()
+          && CFStringGetCString((CFStringRef)element,
+          buf, sizeof(buf),
+          kCFStringEncodingASCII)) {
+            _nl_locale_name_canonicalize(buf);
+            size += strlen(buf) + 1;
+            /* Most GNU programs use msgids in English and don't ship
+               an en.mo message catalog.  Therefore when we see "en"
+               in the preferences list, arrange for gettext() to
+               return the msgid, and ignore all further elements of
+               the preferences list.  */
+            if (strcmp(buf, "en") == 0)
+              break;
+          } else
+            break;
+        }
+        if (size > 0) {
+          char *languages = (char *) malloc(size);
 
-		if (languages != NULL)
-		  {
-		    char *p = languages;
+          if (languages != NULL) {
+            char *p = languages;
 
-		    for (i = 0; i < n; i++)
-		      {
-			CFTypeRef element =
-			  CFArrayGetValueAtIndex (prefArray, i);
-			if (element != NULL
-		            && CFGetTypeID (element) == CFStringGetTypeID ()
-			    && CFStringGetCString ((CFStringRef)element,
-						   buf, sizeof (buf),
-						   kCFStringEncodingASCII))
-			  {
-			    _nl_locale_name_canonicalize (buf);
-			    strcpy (p, buf);
-			    p += strlen (buf);
-			    *p++ = ':';
-			    if (strcmp (buf, "en") == 0)
-			      break;
-			  }
-			else
-			  break;
-		      }
-		    *--p = '\0';
+            for (i = 0; i < n; i++) {
+              CFTypeRef element =
+                CFArrayGetValueAtIndex(prefArray, i);
+              if (element != NULL
+                  && CFGetTypeID(element) == CFStringGetTypeID()
+                  && CFStringGetCString((CFStringRef)element,
+                                        buf, sizeof(buf),
+                                        kCFStringEncodingASCII)) {
+                _nl_locale_name_canonicalize(buf);
+                strcpy(p, buf);
+                p += strlen(buf);
+                *p++ = ':';
+                if (strcmp(buf, "en") == 0)
+                  break;
+              } else
+                break;
+            }
+            *--p = '\0';
 
-		    cached_languages = languages;
-		  }
-	      }
-	  }
-	cache_initialized = 1;
+            cached_languages = languages;
+          }
+        }
       }
+      cache_initialized = 1;
+    }
     if (cached_languages != NULL)
       return cached_languages;
   }

LiVES-2.4.2.tar.bz2/intl/loadinfo.h -> LiVES-2.4.3.tar.bz2/intl/loadinfo.h Changed

@@ -48,10 +48,10 @@
 
 /* Separator in PATH like lists of pathnames.  */
 #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+/* Win32, OS/2, DOS */
 # define PATH_SEPARATOR ';'
 #else
-  /* Unix */
+/* Unix */
 # define PATH_SEPARATOR ':'
 #endif
 
@@ -62,8 +62,7 @@
 #define XPG_MODIFIER		8
 
 
-struct loaded_l10nfile
-{
+struct loaded_l10nfile {
   const char *filename;
   int decided;
 
@@ -78,8 +77,8 @@
    names.  Normalization allows the user to use any of the common
    names.  The return value is dynamically allocated and has to be
    freed by the caller.  */
-extern const char *_nl_normalize_codeset (const char *codeset,
-					  size_t name_len);
+extern const char *_nl_normalize_codeset(const char *codeset,
+    size_t name_len);
 
 /* Lookup a locale dependent file.
    *L10NFILE_LIST denotes a pool of lookup results of locale dependent
@@ -96,18 +95,18 @@
    furthermore its ->successor[] field contains a list of other lookup
    results from which this lookup result inherits.  */
 extern struct loaded_l10nfile *
-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
-		    const char *dirlist, size_t dirlist_len, int mask,
-		    const char *language, const char *territory,
-		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier,
-		    const char *filename, int do_allocate);
+_nl_make_l10nflist(struct loaded_l10nfile **l10nfile_list,
+                   const char *dirlist, size_t dirlist_len, int mask,
+                   const char *language, const char *territory,
+                   const char *codeset, const char *normalized_codeset,
+                   const char *modifier,
+                   const char *filename, int do_allocate);
 
 /* Lookup the real locale name for a locale alias NAME, or NULL if
    NAME is not a locale alias (but possibly a real locale name).
    The return value is statically allocated and must not be freed.  */
 /* Part of the libintl ABI only for the sake of the gettext.m4 macro.  */
-extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name);
+extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias(const char *name);
 
 /* Split a locale name NAME into its pieces: language, modifier,
    territory, codeset.
@@ -124,9 +123,9 @@
      XPG_CODESET                 for *CODESET,
      XPG_NORM_CODESET            for *NORMALIZED_CODESET.
  */
-extern int _nl_explode_name (char *name, const char **language,
-			     const char **modifier, const char **territory,
-			     const char **codeset,
-			     const char **normalized_codeset);
+extern int _nl_explode_name(char *name, const char **language,
+                            const char **modifier, const char **territory,
+                            const char **codeset,
+                            const char **normalized_codeset);
 
 #endif	/* loadinfo.h */

LiVES-2.4.2.tar.bz2/intl/loadmsgcat.c -> LiVES-2.4.3.tar.bz2/intl/loadmsgcat.c Changed

@@ -46,10 +46,10 @@
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
- #pragma alloca
+#pragma alloca
 #   else
 #    ifndef alloca
-char *alloca ();
+char *alloca();
 #    endif
 #   endif
 #  endif
@@ -485,12 +485,12 @@
 /* For systems that distinguish between text and binary I/O.
    O_BINARY is usually declared in <fcntl.h>. */
 #if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
+/* For MSC-compatible compilers.  */
 # define O_BINARY _O_BINARY
 # define O_TEXT _O_TEXT
 #endif
 #ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+/* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
 # undef O_BINARY
 # undef O_TEXT
 #endif
@@ -508,267 +508,247 @@
 
 /* Expand a system dependent string segment.  Return NULL if unsupported.  */
 static const char *
-get_sysdep_segment_value (const char *name)
-{
+get_sysdep_segment_value(const char *name) {
   /* Test for an ISO C 99 section 7.8.1 format string directive.
      Syntax:
      P R I { d | i | o | u | x | X }
      { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR }  */
   /* We don't use a table of 14 times 6 'const char *' strings here, because
      data relocations cost startup time.  */
-  if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
-    {
-      if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
-	  || name[3] == 'x' || name[3] == 'X')
-	{
-	  if (name[4] == '8' && name[5] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId8;
-	      if (name[3] == 'i')
-		return PRIi8;
-	      if (name[3] == 'o')
-		return PRIo8;
-	      if (name[3] == 'u')
-		return PRIu8;
-	      if (name[3] == 'x')
-		return PRIx8;
-	      if (name[3] == 'X')
-		return PRIX8;
-	      abort ();
-	    }
-	  if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId16;
-	      if (name[3] == 'i')
-		return PRIi16;
-	      if (name[3] == 'o')
-		return PRIo16;
-	      if (name[3] == 'u')
-		return PRIu16;
-	      if (name[3] == 'x')
-		return PRIx16;
-	      if (name[3] == 'X')
-		return PRIX16;
-	      abort ();
-	    }
-	  if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId32;
-	      if (name[3] == 'i')
-		return PRIi32;
-	      if (name[3] == 'o')
-		return PRIo32;
-	      if (name[3] == 'u')
-		return PRIu32;
-	      if (name[3] == 'x')
-		return PRIx32;
-	      if (name[3] == 'X')
-		return PRIX32;
-	      abort ();
-	    }
-	  if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
-	    {
-	      if (name[3] == 'd')
-		return PRId64;
-	      if (name[3] == 'i')
-		return PRIi64;
-	      if (name[3] == 'o')
-		return PRIo64;
-	      if (name[3] == 'u')
-		return PRIu64;
-	      if (name[3] == 'x')
-		return PRIx64;
-	      if (name[3] == 'X')
-		return PRIX64;
-	      abort ();
-	    }
-	  if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
-	      && name[7] == 'S' && name[8] == 'T')
-	    {
-	      if (name[9] == '8' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST8;
-		  if (name[3] == 'i')
-		    return PRIiLEAST8;
-		  if (name[3] == 'o')
-		    return PRIoLEAST8;
-		  if (name[3] == 'u')
-		    return PRIuLEAST8;
-		  if (name[3] == 'x')
-		    return PRIxLEAST8;
-		  if (name[3] == 'X')
-		    return PRIXLEAST8;
-		  abort ();
-		}
-	      if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST16;
-		  if (name[3] == 'i')
-		    return PRIiLEAST16;
-		  if (name[3] == 'o')
-		    return PRIoLEAST16;
-		  if (name[3] == 'u')
-		    return PRIuLEAST16;
-		  if (name[3] == 'x')
-		    return PRIxLEAST16;
-		  if (name[3] == 'X')
-		    return PRIXLEAST16;
-		  abort ();
-		}
-	      if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST32;
-		  if (name[3] == 'i')
-		    return PRIiLEAST32;
-		  if (name[3] == 'o')
-		    return PRIoLEAST32;
-		  if (name[3] == 'u')
-		    return PRIuLEAST32;
-		  if (name[3] == 'x')
-		    return PRIxLEAST32;
-		  if (name[3] == 'X')
-		    return PRIXLEAST32;
-		  abort ();
-		}
-	      if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdLEAST64;
-		  if (name[3] == 'i')
-		    return PRIiLEAST64;
-		  if (name[3] == 'o')
-		    return PRIoLEAST64;
-		  if (name[3] == 'u')
-		    return PRIuLEAST64;
-		  if (name[3] == 'x')
-		    return PRIxLEAST64;
-		  if (name[3] == 'X')
-		    return PRIXLEAST64;
-		  abort ();
-		}
-	    }
-	  if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
-	      && name[7] == 'T')
-	    {
-	      if (name[8] == '8' && name[9] == '\0')
-		{
-		  if (name[3] == 'd')
-		    return PRIdFAST8;
-		  if (name[3] == 'i')
-		    return PRIiFAST8;
-		  if (name[3] == 'o')
-		    return PRIoFAST8;
-		  if (name[3] == 'u')
-		    return PRIuFAST8;
-		  if (name[3] == 'x')
-		    return PRIxFAST8;
-		  if (name[3] == 'X')
-		    return PRIXFAST8;
-		  abort ();
-		}
-	      if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
-		{
-		  if (name[3] == 'd')

LiVES-2.4.2.tar.bz2/intl/localcharset.c -> LiVES-2.4.3.tar.bz2/intl/localcharset.c Changed

@@ -71,7 +71,7 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+/* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -100,176 +100,165 @@
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static const char * volatile charset_aliases;
+static const char *volatile charset_aliases;
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
-get_charset_aliases (void)
-{
+get_charset_aliases(void) {
   const char *cp;
 
   cp = charset_aliases;
-  if (cp == NULL)
-    {
+  if (cp == NULL) {
 #if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
-      FILE *fp;
-      const char *dir;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Make it possible to override the charset.alias location.  This is
-	 necessary for running the testsuite before "make install".  */
-      dir = getenv ("CHARSETALIASDIR");
-      if (dir == NULL || dir[0] == '\0')
-	dir = relocate (LIBDIR);
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
+    FILE *fp;
+    const char *dir;
+    const char *base = "charset.alias";
+    char *file_name;
+
+    /* Make it possible to override the charset.alias location.  This is
+    necessary for running the testsuite before "make install".  */
+    dir = getenv("CHARSETALIASDIR");
+    if (dir == NULL || dir[0] == '\0')
+      dir = relocate(LIBDIR);
+
+    /* Concatenate dir and base into freshly allocated file_name.  */
+    {
+      size_t dir_len = strlen(dir);
+      size_t base_len = strlen(base);
+      int add_slash = (dir_len > 0 && !ISSLASH(dir[dir_len - 1]));
+      file_name = (char *) malloc(dir_len + add_slash + base_len + 1);
+      if (file_name != NULL) {
+        memcpy(file_name, dir, dir_len);
+        if (add_slash)
+          file_name[dir_len] = DIRECTORY_SEPARATOR;
+        memcpy(file_name + dir_len + add_slash, base, base_len + 1);
+      }
+    }
+
+    if (file_name == NULL || (fp = fopen(file_name, "r")) == NULL)
+      /* Out of memory or file not found, treat it as empty.  */
+      cp = "";
+    else {
+      /* Parse the file's contents.  */
+      char *res_ptr = NULL;
+      size_t res_size = 0;
+
+      for (;;) {
+        int c;
+        char buf1[50+1];
+        char buf2[50+1];
+        size_t l1, l2;
+        char *old_res_ptr;
+
+        c = getc(fp);
+        if (c == EOF)
+          break;
+        if (c == '\n' || c == ' ' || c == '\t')
+          continue;
+        if (c == '#') {
+          /* Skip comment, to end of line.  */
+          do
+            c = getc(fp);
+          while (!(c == EOF || c == '\n'));
+          if (c == EOF)
+            break;
+          continue;
+        }
+        ungetc(c, fp);
+        if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+          break;
+        l1 = strlen(buf1);
+        l2 = strlen(buf2);
+        old_res_ptr = res_ptr;
+        if (res_size == 0) {
+          res_size = l1 + 1 + l2 + 1;
+          res_ptr = (char *) malloc(res_size + 1);
+        } else {
+          res_size += l1 + 1 + l2 + 1;
+          res_ptr = (char *) realloc(res_ptr, res_size + 1);
+        }
+        if (res_ptr == NULL) {
+          /* Out of memory. */
+          res_size = 0;
+          if (old_res_ptr != NULL)
+            free(old_res_ptr);
+          break;
+        }
+        strcpy(res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+        strcpy(res_ptr + res_size - (l2 + 1), buf2);
+      }
+      fclose(fp);
+      if (res_size == 0)
+        cp = "";
+      else {
+        *(res_ptr + res_size) = '\0';
+        cp = res_ptr;
       }
+    }
 
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-
-	  for (;;)
-	    {
-	      int c;
-	      char buf1[50+1];
-	      char buf2[50+1];
-	      size_t l1, l2;
-	      char *old_res_ptr;
-
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      old_res_ptr = res_ptr;
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = (char *) malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  if (old_res_ptr != NULL)
-		    free (old_res_ptr);
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";

LiVES-2.4.2.tar.bz2/intl/localcharset.h -> LiVES-2.4.3.tar.bz2/intl/localcharset.h Changed

LiVES-2.4.2.tar.bz2/intl/localealias.c -> LiVES-2.4.3.tar.bz2/intl/localealias.c Changed

@@ -47,10 +47,10 @@
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
- #pragma alloca
+#pragma alloca
 #   else
 #    ifndef alloca
-char *alloca ();
+char *alloca();
 #    endif
 #   endif
 #  endif
@@ -122,11 +122,10 @@
 #endif
 
 
-__libc_lock_define_initialized (static, lock)
+__libc_lock_define_initialized(static, lock)
 
 
-struct alias_map
-{
+struct alias_map {
   const char *alias;
   const char *value;
 };
@@ -136,78 +135,73 @@
 # define libc_freeres_ptr(decl) decl
 #endif
 
-libc_freeres_ptr (static char *string_space);
+libc_freeres_ptr(static char *string_space);
 static size_t string_space_act;
 static size_t string_space_max;
-libc_freeres_ptr (static struct alias_map *map);
+libc_freeres_ptr(static struct alias_map *map);
 static size_t nmap;
 static size_t maxmap;
 
 
 /* Prototypes for local functions.  */
-static size_t read_alias_file (const char *fname, int fname_len)
-     internal_function;
-static int extend_alias_table (void);
-static int alias_compare (const struct alias_map *map1,
-			  const struct alias_map *map2);
+static size_t read_alias_file(const char *fname, int fname_len)
+internal_function;
+static int extend_alias_table(void);
+static int alias_compare(const struct alias_map *map1,
+                         const struct alias_map *map2);
 
 
 const char *
-_nl_expand_alias (const char *name)
-{
+_nl_expand_alias(const char *name) {
   static const char *locale_alias_path;
   struct alias_map *retval;
   const char *result = NULL;
   size_t added;
 
-  __libc_lock_lock (lock);
+  __libc_lock_lock(lock);
 
   if (locale_alias_path == NULL)
     locale_alias_path = LOCALE_ALIAS_PATH;
 
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) (const void *,
-							 const void *)
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == PATH_SEPARATOR)
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
+  do {
+    struct alias_map item;
+
+    item.alias = name;
+
+    if (nmap > 0)
+      retval = (struct alias_map *) bsearch(&item, map, nmap,
+                                            sizeof(struct alias_map),
+                                            (int ( *)(const void *,
+                                                const void *)
+                                            ) alias_compare);
+    else
+      retval = NULL;
+
+    /* We really found an alias.  Return the value.  */
+    if (retval != NULL) {
+      result = retval->value;
+      break;
     }
-  while (added != 0);
 
-  __libc_lock_unlock (lock);
+    /* Perhaps we can find another alias file.  */
+    added = 0;
+    while (added == 0 && locale_alias_path[0] != '\0') {
+      const char *start;
+
+      while (locale_alias_path[0] == PATH_SEPARATOR)
+        ++locale_alias_path;
+      start = locale_alias_path;
+
+      while (locale_alias_path[0] != '\0'
+             && locale_alias_path[0] != PATH_SEPARATOR)
+        ++locale_alias_path;
+
+      if (start < locale_alias_path)
+        added = read_alias_file(start, locale_alias_path - start);
+    }
+  } while (added != 0);
+
+  __libc_lock_unlock(lock);
 
   return result;
 }
@@ -215,189 +209,179 @@
 
 static size_t
 internal_function
-read_alias_file (const char *fname, int fname_len)
-{
+read_alias_file(const char *fname, int fname_len) {
   FILE *fp;
   char *full_fname;
   size_t added;
   static const char aliasfile[] = "/locale.alias";
 
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+  full_fname = (char *) alloca(fname_len + sizeof aliasfile);
 #ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
+  mempcpy(mempcpy(full_fname, fname, fname_len),
+          aliasfile, sizeof aliasfile);
 #else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
+  memcpy(full_fname, fname, fname_len);
+  memcpy(&full_fname[fname_len], aliasfile, sizeof aliasfile);
 #endif
 
 #ifdef _LIBC
   /* Note the file is opened with cancellation in the I/O functions
      disabled.  */
-  fp = fopen (relocate (full_fname), "rc");
+  fp = fopen(relocate(full_fname), "rc");
 #else
-  fp = fopen (relocate (full_fname), "r");
+  fp = fopen(relocate(full_fname), "r");
 #endif
-  freea (full_fname);
+  freea(full_fname);
   if (fp == NULL)
     return 0;
 
 #ifdef HAVE___FSETLOCKING
   /* No threads present.  */
-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
+  __fsetlocking(fp, FSETLOCKING_BYCALLER);
 #endif
 
   added = 0;
-  while (!FEOF (fp))

LiVES-2.4.2.tar.bz2/intl/localename.c -> LiVES-2.4.3.tar.bz2/intl/localename.c Changed

@@ -709,8 +709,7 @@
 static
 #  endif
 void
-gl_locale_name_canonicalize (char *name)
-{
+gl_locale_name_canonicalize(char *name) {
   /* This conversion is based on a posting by
      Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08,
      http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
@@ -720,8 +719,11 @@
      Therefore we do it ourselves, using a table based on the results of the
      MacOS X 10.3.8 function
      CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
-  typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
-	  legacy_entry;
+  typedef struct {
+    const char legacy[21+1];
+    const char unixy[5+1];
+  }
+  legacy_entry;
   static const legacy_entry legacy_table[] = {
     { "Afrikaans",             "af" },
     { "Albanian",              "sq" },
@@ -858,8 +860,11 @@
 
   /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
      to Unix (ISO 639 and ISO 3166) names.  */
-  typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
-	  langtag_entry;
+  typedef struct {
+    const char langtag[7+1];
+    const char unixy[12+1];
+  }
+  langtag_entry;
   static const langtag_entry langtag_table[] = {
     /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
        The default script for az on Unix is Latin.  */
@@ -888,8 +893,11 @@
 
   /* Convert script names (ISO 15924) to Unix conventions.
      See http://www.unicode.org/iso15924/iso15924-codes.html  */
-  typedef struct { const char script[4+1]; const char unixy[9+1]; }
-	  script_entry;
+  typedef struct {
+    const char script[4+1];
+    const char unixy[9+1];
+  }
+  script_entry;
   static const script_entry script_table[] = {
     { "Arab", "arabic" },
     { "Cyrl", "cyrillic" },
@@ -897,79 +905,71 @@
   };
 
   /* Step 1: Convert using legacy_table.  */
-  if (name[0] >= 'A' && name[0] <= 'Z')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (legacy_table) / sizeof (legacy_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if name occurs in legacy_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const legacy_entry *p = &legacy_table[i];
-	  if (strcmp (name, p->legacy) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name, legacy_table[i1].legacy) == 0)
-	{
-	  strcpy (name, legacy_table[i1].unixy);
-	  return;
-	}
+  if (name[0] >= 'A' && name[0] <= 'Z') {
+    unsigned int i1, i2;
+    i1 = 0;
+    i2 = sizeof(legacy_table) / sizeof(legacy_entry);
+    while (i2 - i1 > 1) {
+      /* At this point we know that if name occurs in legacy_table,
+         its index must be >= i1 and < i2.  */
+      unsigned int i = (i1 + i2) >> 1;
+      const legacy_entry *p = &legacy_table[i];
+      if (strcmp(name, p->legacy) < 0)
+        i2 = i;
+      else
+        i1 = i;
     }
+    if (strcmp(name, legacy_table[i1].legacy) == 0) {
+      strcpy(name, legacy_table[i1].unixy);
+      return;
+    }
+  }
 
   /* Step 2: Convert using langtag_table and script_table.  */
-  if (strlen (name) == 7 && name[2] == '-')
-    {
-      unsigned int i1, i2;
-      i1 = 0;
-      i2 = sizeof (langtag_table) / sizeof (langtag_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if name occurs in langtag_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const langtag_entry *p = &langtag_table[i];
-	  if (strcmp (name, p->langtag) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name, langtag_table[i1].langtag) == 0)
-	{
-	  strcpy (name, langtag_table[i1].unixy);
-	  return;
-	}
+  if (strlen(name) == 7 && name[2] == '-') {
+    unsigned int i1, i2;
+    i1 = 0;
+    i2 = sizeof(langtag_table) / sizeof(langtag_entry);
+    while (i2 - i1 > 1) {
+      /* At this point we know that if name occurs in langtag_table,
+         its index must be >= i1 and < i2.  */
+      unsigned int i = (i1 + i2) >> 1;
+      const langtag_entry *p = &langtag_table[i];
+      if (strcmp(name, p->langtag) < 0)
+        i2 = i;
+      else
+        i1 = i;
+    }
+    if (strcmp(name, langtag_table[i1].langtag) == 0) {
+      strcpy(name, langtag_table[i1].unixy);
+      return;
+    }
 
-      i1 = 0;
-      i2 = sizeof (script_table) / sizeof (script_entry);
-      while (i2 - i1 > 1)
-	{
-	  /* At this point we know that if (name + 3) occurs in script_table,
-	     its index must be >= i1 and < i2.  */
-	  unsigned int i = (i1 + i2) >> 1;
-	  const script_entry *p = &script_table[i];
-	  if (strcmp (name + 3, p->script) < 0)
-	    i2 = i;
-	  else
-	    i1 = i;
-	}
-      if (strcmp (name + 3, script_table[i1].script) == 0)
-	{
-	  name[2] = '@';
-	  strcpy (name + 3, script_table[i1].unixy);
-	  return;
-	}
+    i1 = 0;
+    i2 = sizeof(script_table) / sizeof(script_entry);
+    while (i2 - i1 > 1) {
+      /* At this point we know that if (name + 3) occurs in script_table,
+         its index must be >= i1 and < i2.  */
+      unsigned int i = (i1 + i2) >> 1;
+      const script_entry *p = &script_table[i];
+      if (strcmp(name + 3, p->script) < 0)
+        i2 = i;
+      else
+        i1 = i;
+    }
+    if (strcmp(name + 3, script_table[i1].script) == 0) {
+      name[2] = '@';
+      strcpy(name + 3, script_table[i1].unixy);
+      return;
     }
+  }
 
   /* Step 3: Convert new-style dash to Unix underscore. */
   {
     char *p;
     for (p = name; *p != '\0'; p++)
       if (*p == '-')
-	*p = '_';
+        *p = '_';
   }
 }
 
@@ -992,25 +992,24 @@
    The result must not be freed; it is statically allocated.  */
 
 const char *
-gl_locale_name_posix (int category, const char *categoryname)
-{
+gl_locale_name_posix(int category, const char *categoryname) {
   /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
      On some systems this can be done by the 'setlocale' function itself.  */
 #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
+  return setlocale(category, NULL);
 #else
   const char *retval;

LiVES-2.4.2.tar.bz2/intl/lock.c -> LiVES-2.4.3.tar.bz2/intl/lock.c Changed

@@ -34,34 +34,30 @@
 
 /* The function to be executed by a dummy thread.  */
 static void *
-dummy_thread_func (void *arg)
-{
+dummy_thread_func(void *arg) {
   return arg;
 }
 
 int
-glthread_in_use (void)
-{
+glthread_in_use(void) {
   static int tested;
   static int result; /* 1: linked with -lpthread, 0: only with libc */
 
-  if (!tested)
-    {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-	/* Thread creation failed.  */
-	result = 0;
-      else
-	{
-	  /* Thread creation works.  */
-	  void *retval;
-	  if (pthread_join (thread, &retval) != 0)
-	    abort ();
-	  result = 1;
-	}
-      tested = 1;
+  if (!tested) {
+    pthread_t thread;
+
+    if (pthread_create(&thread, NULL, dummy_thread_func, NULL) != 0)
+      /* Thread creation failed.  */
+      result = 0;
+    else {
+      /* Thread creation works.  */
+      void *retval;
+      if (pthread_join(thread, &retval) != 0)
+        abort();
+      result = 1;
     }
+    tested = 1;
+  }
   return result;
 }
 
@@ -76,61 +72,54 @@
 #  if !defined PTHREAD_RWLOCK_INITIALIZER
 
 void
-glthread_rwlock_init (gl_rwlock_t *lock)
-{
-  if (pthread_rwlock_init (&lock->rwlock, NULL) != 0)
-    abort ();
+glthread_rwlock_init(gl_rwlock_t *lock) {
+  if (pthread_rwlock_init(&lock->rwlock, NULL) != 0)
+    abort();
   lock->initialized = 1;
 }
 
 void
-glthread_rwlock_rdlock (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      if (pthread_mutex_lock (&lock->guard) != 0)
-	abort ();
-      if (!lock->initialized)
-	glthread_rwlock_init (lock);
-      if (pthread_mutex_unlock (&lock->guard) != 0)
-	abort ();
-    }
-  if (pthread_rwlock_rdlock (&lock->rwlock) != 0)
-    abort ();
+glthread_rwlock_rdlock(gl_rwlock_t *lock) {
+  if (!lock->initialized) {
+    if (pthread_mutex_lock(&lock->guard) != 0)
+      abort();
+    if (!lock->initialized)
+      glthread_rwlock_init(lock);
+    if (pthread_mutex_unlock(&lock->guard) != 0)
+      abort();
+  }
+  if (pthread_rwlock_rdlock(&lock->rwlock) != 0)
+    abort();
 }
 
 void
-glthread_rwlock_wrlock (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      if (pthread_mutex_lock (&lock->guard) != 0)
-	abort ();
-      if (!lock->initialized)
-	glthread_rwlock_init (lock);
-      if (pthread_mutex_unlock (&lock->guard) != 0)
-	abort ();
-    }
-  if (pthread_rwlock_wrlock (&lock->rwlock) != 0)
-    abort ();
+glthread_rwlock_wrlock(gl_rwlock_t *lock) {
+  if (!lock->initialized) {
+    if (pthread_mutex_lock(&lock->guard) != 0)
+      abort();
+    if (!lock->initialized)
+      glthread_rwlock_init(lock);
+    if (pthread_mutex_unlock(&lock->guard) != 0)
+      abort();
+  }
+  if (pthread_rwlock_wrlock(&lock->rwlock) != 0)
+    abort();
 }
 
 void
-glthread_rwlock_unlock (gl_rwlock_t *lock)
-{
+glthread_rwlock_unlock(gl_rwlock_t *lock) {
   if (!lock->initialized)
-    abort ();
-  if (pthread_rwlock_unlock (&lock->rwlock) != 0)
-    abort ();
+    abort();
+  if (pthread_rwlock_unlock(&lock->rwlock) != 0)
+    abort();
 }
 
 void
-glthread_rwlock_destroy (gl_rwlock_t *lock)
-{
+glthread_rwlock_destroy(gl_rwlock_t *lock) {
   if (!lock->initialized)
-    abort ();
-  if (pthread_rwlock_destroy (&lock->rwlock) != 0)
-    abort ();
+    abort();
+  if (pthread_rwlock_destroy(&lock->rwlock) != 0)
+    abort();
   lock->initialized = 0;
 }
 
@@ -139,110 +128,96 @@
 # else
 
 void
-glthread_rwlock_init (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_init (&lock->lock, NULL) != 0)
-    abort ();
-  if (pthread_cond_init (&lock->waiting_readers, NULL) != 0)
-    abort ();
-  if (pthread_cond_init (&lock->waiting_writers, NULL) != 0)
-    abort ();
+glthread_rwlock_init(gl_rwlock_t *lock) {
+  if (pthread_mutex_init(&lock->lock, NULL) != 0)
+    abort();
+  if (pthread_cond_init(&lock->waiting_readers, NULL) != 0)
+    abort();
+  if (pthread_cond_init(&lock->waiting_writers, NULL) != 0)
+    abort();
   lock->waiting_writers_count = 0;
   lock->runcount = 0;
 }
 
 void
-glthread_rwlock_rdlock (gl_rwlock_t *lock)
-{
-  if (pthread_mutex_lock (&lock->lock) != 0)
-    abort ();
+glthread_rwlock_rdlock(gl_rwlock_t *lock) {
+  if (pthread_mutex_lock(&lock->lock) != 0)
+    abort();
   /* Test whether only readers are currently running, and whether the runcount
      field will not overflow.  */
   /* POSIX says: "It is implementation-defined whether the calling thread
      acquires the lock when a writer does not hold the lock and there are
      writers blocked on the lock."  Let's say, no: give the writers a higher
      priority.  */
-  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-	 waiting_readers.  */
-      if (pthread_cond_wait (&lock->waiting_readers, &lock->lock) != 0)
-	abort ();
-    }
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) {
+    /* This thread has to wait for a while.  Enqueue it among the
+    waiting_readers.  */
+    if (pthread_cond_wait(&lock->waiting_readers, &lock->lock) != 0)
+      abort();
+  }
   lock->runcount++;
-  if (pthread_mutex_unlock (&lock->lock) != 0)
-    abort ();
+  if (pthread_mutex_unlock(&lock->lock) != 0)

LiVES-2.4.2.tar.bz2/intl/lock.h -> LiVES-2.4.3.tar.bz2/intl/lock.h Changed

@@ -80,7 +80,7 @@
 /* The pthread_in_use() detection needs to be done at runtime.  */
 #  define pthread_in_use() \
      glthread_in_use ()
-extern int glthread_in_use (void);
+extern int glthread_in_use(void);
 
 # endif
 
@@ -227,13 +227,12 @@
 
 #  else
 
-typedef struct
-        {
-          int initialized;
-          pthread_mutex_t guard;   /* protects the initialization */
-          pthread_rwlock_t rwlock; /* read-write lock */
-        }
-        gl_rwlock_t;
+typedef struct {
+  int initialized;
+  pthread_mutex_t guard;   /* protects the initialization */
+  pthread_rwlock_t rwlock; /* read-write lock */
+}
+gl_rwlock_t;
 #   define gl_rwlock_define(STORAGECLASS, NAME) \
       STORAGECLASS gl_rwlock_t NAME;
 #   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
@@ -275,25 +274,24 @@
             glthread_rwlock_destroy (&NAME); \
         }                                    \
       while (0)
-extern void glthread_rwlock_init (gl_rwlock_t *lock);
-extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
+extern void glthread_rwlock_init(gl_rwlock_t *lock);
+extern void glthread_rwlock_rdlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_wrlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_unlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_destroy(gl_rwlock_t *lock);
 
 #  endif
 
 # else
 
-typedef struct
-        {
-          pthread_mutex_t lock; /* protects the remaining fields */
-          pthread_cond_t waiting_readers; /* waiting readers */
-          pthread_cond_t waiting_writers; /* waiting writers */
-          unsigned int waiting_writers_count; /* number of waiting writers */
-          int runcount; /* number of readers running, or -1 when a writer runs */
-        }
-        gl_rwlock_t;
+typedef struct {
+  pthread_mutex_t lock; /* protects the remaining fields */
+  pthread_cond_t waiting_readers; /* waiting readers */
+  pthread_cond_t waiting_writers; /* waiting writers */
+  unsigned int waiting_writers_count; /* number of waiting writers */
+  int runcount; /* number of readers running, or -1 when a writer runs */
+}
+gl_rwlock_t;
 # define gl_rwlock_define(STORAGECLASS, NAME) \
     STORAGECLASS gl_rwlock_t NAME;
 # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
@@ -335,11 +333,11 @@
           glthread_rwlock_destroy (&NAME); \
       }                                    \
     while (0)
-extern void glthread_rwlock_init (gl_rwlock_t *lock);
-extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
-extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
+extern void glthread_rwlock_init(gl_rwlock_t *lock);
+extern void glthread_rwlock_rdlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_wrlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_unlock(gl_rwlock_t *lock);
+extern void glthread_rwlock_destroy(gl_rwlock_t *lock);
 
 # endif
 
@@ -392,13 +390,12 @@
 
 #  else
 
-typedef struct
-        {
-          pthread_mutex_t recmutex; /* recursive mutex */
-          pthread_mutex_t guard;    /* protects the initialization */
-          int initialized;
-        }
-        gl_recursive_lock_t;
+typedef struct {
+  pthread_mutex_t recmutex; /* recursive mutex */
+  pthread_mutex_t guard;    /* protects the initialization */
+  int initialized;
+}
+gl_recursive_lock_t;
 #   define gl_recursive_lock_define(STORAGECLASS, NAME) \
       STORAGECLASS gl_recursive_lock_t NAME;
 #   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
@@ -433,10 +430,10 @@
             glthread_recursive_lock_destroy (&NAME); \
         }                                            \
       while (0)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_init(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy(gl_recursive_lock_t *lock);
 
 #  endif
 
@@ -445,13 +442,12 @@
 /* Old versions of POSIX threads on Solaris did not have recursive locks.
    We have to implement them ourselves.  */
 
-typedef struct
-        {
-          pthread_mutex_t mutex;
-          pthread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
+typedef struct {
+  pthread_mutex_t mutex;
+  pthread_t owner;
+  unsigned long depth;
+}
+gl_recursive_lock_t;
 #  define gl_recursive_lock_define(STORAGECLASS, NAME) \
      STORAGECLASS gl_recursive_lock_t NAME;
 #  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
@@ -486,10 +482,10 @@
            glthread_recursive_lock_destroy (&NAME); \
        }                                            \
      while (0)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
-extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_init(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock(gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy(gl_recursive_lock_t *lock);
 
 # endif
 
@@ -513,7 +509,7 @@
           }                                              \
       }                                                  \
     while (0)
-extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+extern int glthread_once_singlethreaded(pthread_once_t *once_control);
 
 # ifdef __cplusplus
 }
@@ -685,8 +681,8 @@
           }                                                           \
       }                                                               \
     while (0)
-extern void glthread_once_call (void *arg);
-extern int glthread_once_singlethreaded (pth_once_t *once_control);
+extern void glthread_once_call(void *arg);
+extern int glthread_once_singlethreaded(pth_once_t *once_control);
 
 # ifdef __cplusplus
 }
@@ -820,13 +816,12 @@
 /* Old Solaris threads did not have recursive locks.
    We have to implement them ourselves.  */
 
-typedef struct
-        {
-          mutex_t mutex;
-          thread_t owner;
-          unsigned long depth;
-        }
-        gl_recursive_lock_t;
+typedef struct {
+  mutex_t mutex;
+  thread_t owner;
+  unsigned long depth;
+}
+gl_recursive_lock_t;
 # define gl_recursive_lock_define(STORAGECLASS, NAME) \
     STORAGECLASS gl_recursive_lock_t NAME;
 # define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
@@ -861,19 +856,18 @@
           glthread_recursive_lock_destroy (&NAME); \
       }                                            \
     while (0)
-extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);

LiVES-2.4.2.tar.bz2/intl/log.c -> LiVES-2.4.3.tar.bz2/intl/log.c Changed

@@ -35,82 +35,71 @@
 
 /* Print an ASCII string with quotes and escape sequences where needed.  */
 static void
-print_escaped (FILE *stream, const char *str)
-{
-  putc ('"', stream);
+print_escaped(FILE *stream, const char *str) {
+  putc('"', stream);
   for (; *str != '\0'; str++)
-    if (*str == '\n')
-      {
-	fputs ("\\n\"", stream);
-	if (str[1] == '\0')
-	  return;
-	fputs ("\n\"", stream);
-      }
-    else
-      {
-	if (*str == '"' || *str == '\\')
-	  putc ('\\', stream);
-	putc (*str, stream);
-      }
-  putc ('"', stream);
+    if (*str == '\n') {
+      fputs("\\n\"", stream);
+      if (str[1] == '\0')
+        return;
+      fputs("\n\"", stream);
+    } else {
+      if (*str == '"' || *str == '\\')
+        putc('\\', stream);
+      putc(*str, stream);
+    }
+  putc('"', stream);
 }
 
 static char *last_logfilename = NULL;
 static FILE *last_logfile = NULL;
-__libc_lock_define_initialized (static, lock)
+__libc_lock_define_initialized(static, lock)
 
 static inline void
-_nl_log_untranslated_locked (const char *logfilename, const char *domainname,
-			     const char *msgid1, const char *msgid2, int plural)
-{
+_nl_log_untranslated_locked(const char *logfilename, const char *domainname,
+                            const char *msgid1, const char *msgid2, int plural) {
   FILE *logfile;
 
   /* Can we reuse the last opened logfile?  */
-  if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
-    {
-      /* Close the last used logfile.  */
-      if (last_logfilename != NULL)
-	{
-	  if (last_logfile != NULL)
-	    {
-	      fclose (last_logfile);
-	      last_logfile = NULL;
-	    }
-	  free (last_logfilename);
-	  last_logfilename = NULL;
-	}
-      /* Open the logfile.  */
-      last_logfilename = (char *) malloc (strlen (logfilename) + 1);
-      if (last_logfilename == NULL)
-	return;
-      strcpy (last_logfilename, logfilename);
-      last_logfile = fopen (logfilename, "a");
-      if (last_logfile == NULL)
-	return;
+  if (last_logfilename == NULL || strcmp(logfilename, last_logfilename) != 0) {
+    /* Close the last used logfile.  */
+    if (last_logfilename != NULL) {
+      if (last_logfile != NULL) {
+        fclose(last_logfile);
+        last_logfile = NULL;
+      }
+      free(last_logfilename);
+      last_logfilename = NULL;
     }
+    /* Open the logfile.  */
+    last_logfilename = (char *) malloc(strlen(logfilename) + 1);
+    if (last_logfilename == NULL)
+      return;
+    strcpy(last_logfilename, logfilename);
+    last_logfile = fopen(logfilename, "a");
+    if (last_logfile == NULL)
+      return;
+  }
   logfile = last_logfile;
 
-  fprintf (logfile, "domain ");
-  print_escaped (logfile, domainname);
-  fprintf (logfile, "\nmsgid ");
-  print_escaped (logfile, msgid1);
-  if (plural)
-    {
-      fprintf (logfile, "\nmsgid_plural ");
-      print_escaped (logfile, msgid2);
-      fprintf (logfile, "\nmsgstr[0] \"\"\n");
-    }
-  else
-    fprintf (logfile, "\nmsgstr \"\"\n");
-  putc ('\n', logfile);
+  fprintf(logfile, "domain ");
+  print_escaped(logfile, domainname);
+  fprintf(logfile, "\nmsgid ");
+  print_escaped(logfile, msgid1);
+  if (plural) {
+    fprintf(logfile, "\nmsgid_plural ");
+    print_escaped(logfile, msgid2);
+    fprintf(logfile, "\nmsgstr[0] \"\"\n");
+  } else
+    fprintf(logfile, "\nmsgstr \"\"\n");
+  putc('\n', logfile);
 }
 
 /* Add to the log file an entry denoting a failed translation.  */
 void
-_nl_log_untranslated (const char *logfilename, const char *domainname,
-		      const char *msgid1, const char *msgid2, int plural)
-{
-  __libc_lock_lock (lock);
-  _nl_log_untranslated_locked (logfilename, domainname, msgid1, msgid2, plural);
-  __libc_lock_unlock (lock);
+_nl_log_untranslated(const char *logfilename, const char *domainname,
+                     const char *msgid1, const char *msgid2, int plural) {
+  __libc_lock_lock(lock);
+  _nl_log_untranslated_locked(logfilename, domainname, msgid1, msgid2, plural);
+  __libc_lock_unlock(lock);
 }

LiVES-2.4.2.tar.bz2/intl/ngettext.c -> LiVES-2.4.3.tar.bz2/intl/ngettext.c Changed

LiVES-2.4.2.tar.bz2/intl/os2compat.c -> LiVES-2.4.3.tar.bz2/intl/os2compat.c Changed

@@ -26,13 +26,12 @@
 #include <sys/param.h>
 
 /* A version of getenv() that works from DLLs */
-extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
+extern unsigned long DosScanEnv(const unsigned char *pszName, unsigned char **ppszValue);
 
 char *
-_nl_getenv (const char *name)
-{
+_nl_getenv(const char *name) {
   unsigned char *value;
-  if (DosScanEnv (name, &value))
+  if (DosScanEnv(name, &value))
     return NULL;
   else
     return value;
@@ -46,53 +45,43 @@
 char *_nlos2_localedir = NULL;
 
 static __attribute__((constructor)) void
-nlos2_initialize ()
-{
-  char *root = getenv ("UNIXROOT");
-  char *gnulocaledir = getenv ("GNULOCALEDIR");
+nlos2_initialize() {
+  char *root = getenv("UNIXROOT");
+  char *gnulocaledir = getenv("GNULOCALEDIR");
 
   _nlos2_libdir = gnulocaledir;
-  if (!_nlos2_libdir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
-          memcpy (_nlos2_libdir, root, sl);
-          memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
-        }
-      else
-        _nlos2_libdir = LIBDIR;
-    }
+  if (!_nlos2_libdir) {
+    if (root) {
+      size_t sl = strlen(root);
+      _nlos2_libdir = (char *) malloc(sl + strlen(LIBDIR) + 1);
+      memcpy(_nlos2_libdir, root, sl);
+      memcpy(_nlos2_libdir + sl, LIBDIR, strlen(LIBDIR) + 1);
+    } else
+      _nlos2_libdir = LIBDIR;
+  }
 
   _nlos2_localealiaspath = gnulocaledir;
-  if (!_nlos2_localealiaspath)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
-          memcpy (_nlos2_localealiaspath, root, sl);
-          memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
-        }
-     else
-        _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
-    }
+  if (!_nlos2_localealiaspath) {
+    if (root) {
+      size_t sl = strlen(root);
+      _nlos2_localealiaspath = (char *) malloc(sl + strlen(LOCALE_ALIAS_PATH) + 1);
+      memcpy(_nlos2_localealiaspath, root, sl);
+      memcpy(_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen(LOCALE_ALIAS_PATH) + 1);
+    } else
+      _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
+  }
 
   _nlos2_localedir = gnulocaledir;
-  if (!_nlos2_localedir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
-          memcpy (_nlos2_localedir, root, sl);
-          memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
-        }
-      else
-        _nlos2_localedir = LOCALEDIR;
-    }
+  if (!_nlos2_localedir) {
+    if (root) {
+      size_t sl = strlen(root);
+      _nlos2_localedir = (char *) malloc(sl + strlen(LOCALEDIR) + 1);
+      memcpy(_nlos2_localedir, root, sl);
+      memcpy(_nlos2_localedir + sl, LOCALEDIR, strlen(LOCALEDIR) + 1);
+    } else
+      _nlos2_localedir = LOCALEDIR;
+  }
 
-  if (strlen (_nlos2_localedir) <= MAXPATHLEN)
-    strcpy (libintl_nl_default_dirname, _nlos2_localedir);
+  if (strlen(_nlos2_localedir) <= MAXPATHLEN)
+    strcpy(libintl_nl_default_dirname, _nlos2_localedir);
 }

LiVES-2.4.2.tar.bz2/intl/plural-exp.c -> LiVES-2.4.3.tar.bz2/intl/plural-exp.c Changed

@@ -32,13 +32,11 @@
 
 /* These structs are the constant expression for the germanic plural
    form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
+static const struct expression plvar = {
   .nargs = 0,
   .operation = var,
 };
-static const struct expression plone =
-{
+static const struct expression plone = {
   .nargs = 0,
   .operation = num,
   .val =
@@ -46,8 +44,7 @@
     .num = 1
   }
 };
-struct expression GERMANIC_PLURAL =
-{
+struct expression GERMANIC_PLURAL = {
   .nargs = 2,
   .operation = not_equal,
   .val =
@@ -72,22 +69,20 @@
 struct expression GERMANIC_PLURAL;
 
 static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      GERMANIC_PLURAL.nargs = 2;
-      GERMANIC_PLURAL.operation = not_equal;
-      GERMANIC_PLURAL.val.args[0] = &plvar;
-      GERMANIC_PLURAL.val.args[1] = &plone;
-    }
+init_germanic_plural() {
+  if (plone.val.num == 0) {
+    plvar.nargs = 0;
+    plvar.operation = var;
+
+    plone.nargs = 0;
+    plone.operation = num;
+    plone.val.num = 1;
+
+    GERMANIC_PLURAL.nargs = 2;
+    GERMANIC_PLURAL.operation = not_equal;
+    GERMANIC_PLURAL.val.args[0] = &plvar;
+    GERMANIC_PLURAL.val.args[1] = &plone;
+  }
 }
 
 # define INIT_GERMANIC_PLURAL() init_germanic_plural ()
@@ -96,60 +91,55 @@
 
 void
 internal_function
-EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
-			   const struct expression **pluralp,
-			   unsigned long int *npluralsp)
-{
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  /* First get the number.  */
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
-	    ++nplurals;
-	  if (!(*nplurals >= '0' && *nplurals <= '9'))
-	    goto no_plural;
+EXTRACT_PLURAL_EXPRESSION(const char *nullentry,
+                          const struct expression **pluralp,
+                          unsigned long int *npluralsp) {
+  if (nullentry != NULL) {
+    const char *plural;
+    const char *nplurals;
+
+    plural = strstr(nullentry, "plural=");
+    nplurals = strstr(nullentry, "nplurals=");
+    if (plural == NULL || nplurals == NULL)
+      goto no_plural;
+    else {
+      char *endp;
+      unsigned long int n;
+      struct parse_args args;
+
+      /* First get the number.  */
+      nplurals += 9;
+      while (*nplurals != '\0' && isspace((unsigned char) *nplurals))
+        ++nplurals;
+      if (!(*nplurals >= '0' && *nplurals <= '9'))
+        goto no_plural;
 #if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
+      n = strtoul(nplurals, &endp, 10);
 #else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
+      for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+        n = n * 10 + (*endp - '0');
 #endif
-	  if (nplurals == endp)
-	    goto no_plural;
-	  *npluralsp = n;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  *pluralp = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      *pluralp = &GERMANIC_PLURAL;
-      *npluralsp = 2;
+      if (nplurals == endp)
+        goto no_plural;
+      *npluralsp = n;
+
+      /* Due to the restrictions bison imposes onto the interface of the
+         scanner function we have to put the input string and the result
+         passed up from the parser into the same structure which address
+         is passed down to the parser.  */
+      plural += 7;
+      args.cp = plural;
+      if (PLURAL_PARSE(&args) != 0)
+        goto no_plural;
+      *pluralp = args.res;
     }
+  } else {
+    /* By default we are using the Germanic form: singular form only
+       for `one', the plural form otherwise.  Yes, this is also what
+       English is using since English is a Germanic language.  */
+no_plural:
+    INIT_GERMANIC_PLURAL();
+    *pluralp = &GERMANIC_PLURAL;
+    *npluralsp = 2;
+  }
 }

LiVES-2.4.2.tar.bz2/intl/plural-exp.h -> LiVES-2.4.3.tar.bz2/intl/plural-exp.h Changed

@@ -60,12 +60,10 @@
 
 /* This is the representation of the expressions to determine the
    plural form.  */
-struct expression
-{
+struct expression {
   int nargs;			/* Number of arguments.  */
   enum expression_operator operation;
-  union
-  {
+  union {
     unsigned long int num;	/* Number value for `num'.  */
     struct expression *args[3];	/* Up to three arguments.  */
   } val;
@@ -73,8 +71,7 @@
 
 /* This is the data structure to pass information to the parser and get
    the result in a thread-safe way.  */
-struct parse_args
-{
+struct parse_args {
   const char *cp;
   struct expression *res;
 };
@@ -107,18 +104,18 @@
 # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
 #endif
 
-extern void FREE_EXPRESSION (struct expression *exp)
-     internal_function;
-extern int PLURAL_PARSE (void *arg);
+extern void FREE_EXPRESSION(struct expression *exp)
+internal_function;
+extern int PLURAL_PARSE(void *arg);
 extern struct expression GERMANIC_PLURAL attribute_hidden;
-extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
-				       const struct expression **pluralp,
-				       unsigned long int *npluralsp)
-     internal_function;
+extern void EXTRACT_PLURAL_EXPRESSION(const char *nullentry,
+                                      const struct expression **pluralp,
+                                      unsigned long int *npluralsp)
+internal_function;
 
 #if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
-extern unsigned long int plural_eval (const struct expression *pexp,
-				      unsigned long int n);
+extern unsigned long int plural_eval(const struct expression *pexp,
+                                     unsigned long int n);
 #endif

LiVES-2.4.2.tar.bz2/intl/plural.c -> LiVES-2.4.3.tar.bz2/intl/plural.c Changed

@@ -97,7 +97,7 @@
    because <config.h> may include arbitrary system headers.
    This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0.  */
 #if defined _AIX && !defined __GNUC__
- #pragma alloca
+#pragma alloca
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -141,15 +141,15 @@
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     EQUOP2 = 258,
-     CMPOP2 = 259,
-     ADDOP2 = 260,
-     MULOP2 = 261,
-     NUMBER = 262
-   };
+/* Put the tokens into the symbol table, so that GDB and other debuggers
+   know about them.  */
+enum yytokentype {
+  EQUOP2 = 258,
+  CMPOP2 = 259,
+  ADDOP2 = 260,
+  MULOP2 = 261,
+  NUMBER = 262
+};
 #endif
 /* Tokens.  */
 #define EQUOP2 258
@@ -162,8 +162,8 @@
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{/* Line 191 of yacc.c.  */
+typedef union YYSTYPE {
+  /* Line 191 of yacc.c.  */
 #line 51 "plural.y"
 
   unsigned long int num;
@@ -172,7 +172,7 @@
 }
 /* Line 191 of yacc.c.  */
 #line 175 "plural.c"
-	YYSTYPE;
+YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -186,15 +186,14 @@
 #line 57 "plural.y"
 
 /* Prototypes for local functions.  */
-static int yylex (YYSTYPE *lval, const char **pexp);
-static void yyerror (const char *str);
+static int yylex(YYSTYPE *lval, const char **pexp);
+static void yyerror(const char *str);
 
 /* Allocation of expressions.  */
 
 static struct expression *
-new_exp (int nargs, enum expression_operator op,
-	 struct expression * const *args)
-{
+new_exp(int nargs, enum expression_operator op,
+        struct expression *const *args) {
   int i;
   struct expression *newp;
 
@@ -204,59 +203,54 @@
       goto fail;
 
   /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
+  newp = (struct expression *) malloc(sizeof(*newp));
+  if (newp != NULL) {
+    newp->nargs = nargs;
+    newp->operation = op;
+    for (i = nargs - 1; i >= 0; i--)
+      newp->val.args[i] = args[i];
+    return newp;
+  }
+
+fail:
   for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
+    FREE_EXPRESSION(args[i]);
 
   return NULL;
 }
 
 static inline struct expression *
-new_exp_0 (enum expression_operator op)
-{
-  return new_exp (0, op, NULL);
+new_exp_0(enum expression_operator op) {
+  return new_exp(0, op, NULL);
 }
 
 static inline struct expression *
-new_exp_1 (enum expression_operator op, struct expression *right)
-{
+new_exp_1(enum expression_operator op, struct expression *right) {
   struct expression *args[1];
 
   args[0] = right;
-  return new_exp (1, op, args);
+  return new_exp(1, op, args);
 }
 
 static struct expression *
-new_exp_2 (enum expression_operator op, struct expression *left,
-	   struct expression *right)
-{
+new_exp_2(enum expression_operator op, struct expression *left,
+          struct expression *right) {
   struct expression *args[2];
 
   args[0] = left;
   args[1] = right;
-  return new_exp (2, op, args);
+  return new_exp(2, op, args);
 }
 
 static inline struct expression *
-new_exp_3 (enum expression_operator op, struct expression *bexp,
-	   struct expression *tbranch, struct expression *fbranch)
-{
+new_exp_3(enum expression_operator op, struct expression *bexp,
+          struct expression *tbranch, struct expression *fbranch) {
   struct expression *args[3];
 
   args[0] = bexp;
   args[1] = tbranch;
   args[2] = fbranch;
-  return new_exp (3, op, args);
+  return new_exp(3, op, args);
 }
 
 
@@ -336,11 +330,11 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID(int yyi)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID(yyi)
+int yyi;
 #endif
 {
   return yyi;
@@ -376,13 +370,13 @@
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
+/* Pacify GCC's `empty if-body' warning.  */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
 #  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
+/* The OS might guarantee only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+   to allow for a few compiler-allocated temporary stack slots.  */
 #   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
 # else
@@ -403,14 +397,14 @@
 #   define YYMALLOC malloc
 #   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+void *malloc(YYSIZE_T);  /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
 #   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

LiVES-2.4.2.tar.bz2/intl/printf-args.c -> LiVES-2.4.3.tar.bz2/intl/printf-args.c Changed

@@ -34,155 +34,148 @@
 STATIC
 #endif
 int
-PRINTF_FETCHARGS (va_list args, arguments *a)
-{
+PRINTF_FETCHARGS(va_list args, arguments *a) {
   size_t i;
   argument *ap;
 
   for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
-    switch (ap->type)
-      {
-      case TYPE_SCHAR:
-	ap->a.a_schar = va_arg (args, /*signed char*/ int);
-	break;
-      case TYPE_UCHAR:
-	ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
-	break;
-      case TYPE_SHORT:
-	ap->a.a_short = va_arg (args, /*short*/ int);
-	break;
-      case TYPE_USHORT:
-	ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
-	break;
-      case TYPE_INT:
-	ap->a.a_int = va_arg (args, int);
-	break;
-      case TYPE_UINT:
-	ap->a.a_uint = va_arg (args, unsigned int);
-	break;
-      case TYPE_LONGINT:
-	ap->a.a_longint = va_arg (args, long int);
-	break;
-      case TYPE_ULONGINT:
-	ap->a.a_ulongint = va_arg (args, unsigned long int);
-	break;
+    switch (ap->type) {
+    case TYPE_SCHAR:
+      ap->a.a_schar = va_arg(args, /*signed char*/ int);
+      break;
+    case TYPE_UCHAR:
+      ap->a.a_uchar = va_arg(args, /*unsigned char*/ int);
+      break;
+    case TYPE_SHORT:
+      ap->a.a_short = va_arg(args, /*short*/ int);
+      break;
+    case TYPE_USHORT:
+      ap->a.a_ushort = va_arg(args, /*unsigned short*/ int);
+      break;
+    case TYPE_INT:
+      ap->a.a_int = va_arg(args, int);
+      break;
+    case TYPE_UINT:
+      ap->a.a_uint = va_arg(args, unsigned int);
+      break;
+    case TYPE_LONGINT:
+      ap->a.a_longint = va_arg(args, long int);
+      break;
+    case TYPE_ULONGINT:
+      ap->a.a_ulongint = va_arg(args, unsigned long int);
+      break;
 #if HAVE_LONG_LONG_INT
-      case TYPE_LONGLONGINT:
-	ap->a.a_longlongint = va_arg (args, long long int);
-	break;
-      case TYPE_ULONGLONGINT:
-	ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
-	break;
+    case TYPE_LONGLONGINT:
+      ap->a.a_longlongint = va_arg(args, long long int);
+      break;
+    case TYPE_ULONGLONGINT:
+      ap->a.a_ulonglongint = va_arg(args, unsigned long long int);
+      break;
 #endif
-      case TYPE_DOUBLE:
-	ap->a.a_double = va_arg (args, double);
-	break;
-      case TYPE_LONGDOUBLE:
-	ap->a.a_longdouble = va_arg (args, long double);
-	break;
-      case TYPE_CHAR:
-	ap->a.a_char = va_arg (args, int);
-	break;
+    case TYPE_DOUBLE:
+      ap->a.a_double = va_arg(args, double);
+      break;
+    case TYPE_LONGDOUBLE:
+      ap->a.a_longdouble = va_arg(args, long double);
+      break;
+    case TYPE_CHAR:
+      ap->a.a_char = va_arg(args, int);
+      break;
 #if HAVE_WINT_T
-      case TYPE_WIDE_CHAR:
-	/* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by
-	   default argument promotions", this is not the case in mingw32,
-	   where wint_t is 'unsigned short'.  */
-	ap->a.a_wide_char =
-	  (sizeof (wint_t) < sizeof (int)
-	   ? va_arg (args, int)
-	   : va_arg (args, wint_t));
-	break;
+    case TYPE_WIDE_CHAR:
+      /* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by
+         default argument promotions", this is not the case in mingw32,
+         where wint_t is 'unsigned short'.  */
+      ap->a.a_wide_char =
+        (sizeof(wint_t) < sizeof(int)
+         ? va_arg(args, int)
+         : va_arg(args, wint_t));
+      break;
 #endif
-      case TYPE_STRING:
-	ap->a.a_string = va_arg (args, const char *);
-	/* A null pointer is an invalid argument for "%s", but in practice
-	   it occurs quite frequently in printf statements that produce
-	   debug output.  Use a fallback in this case.  */
-	if (ap->a.a_string == NULL)
-	  ap->a.a_string = "(NULL)";
-	break;
+    case TYPE_STRING:
+      ap->a.a_string = va_arg(args, const char *);
+      /* A null pointer is an invalid argument for "%s", but in practice
+         it occurs quite frequently in printf statements that produce
+         debug output.  Use a fallback in this case.  */
+      if (ap->a.a_string == NULL)
+        ap->a.a_string = "(NULL)";
+      break;
 #if HAVE_WCHAR_T
-      case TYPE_WIDE_STRING:
-	ap->a.a_wide_string = va_arg (args, const wchar_t *);
-	/* A null pointer is an invalid argument for "%ls", but in practice
-	   it occurs quite frequently in printf statements that produce
-	   debug output.  Use a fallback in this case.  */
-	if (ap->a.a_wide_string == NULL)
-	  {
-	    static const wchar_t wide_null_string[] =
-	      {
-		(wchar_t)'(',
-		(wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L',
-		(wchar_t)')',
-		(wchar_t)0
-	      };
-	    ap->a.a_wide_string = wide_null_string;
-	  }
-	break;
+    case TYPE_WIDE_STRING:
+      ap->a.a_wide_string = va_arg(args, const wchar_t *);
+      /* A null pointer is an invalid argument for "%ls", but in practice
+         it occurs quite frequently in printf statements that produce
+         debug output.  Use a fallback in this case.  */
+      if (ap->a.a_wide_string == NULL) {
+        static const wchar_t wide_null_string[] = {
+          (wchar_t)'(',
+          (wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L',
+          (wchar_t)')',
+          (wchar_t)0
+        };
+        ap->a.a_wide_string = wide_null_string;
+      }
+      break;
 #endif
-      case TYPE_POINTER:
-	ap->a.a_pointer = va_arg (args, void *);
-	break;
-      case TYPE_COUNT_SCHAR_POINTER:
-	ap->a.a_count_schar_pointer = va_arg (args, signed char *);
-	break;
-      case TYPE_COUNT_SHORT_POINTER:
-	ap->a.a_count_short_pointer = va_arg (args, short *);
-	break;
-      case TYPE_COUNT_INT_POINTER:
-	ap->a.a_count_int_pointer = va_arg (args, int *);
-	break;
-      case TYPE_COUNT_LONGINT_POINTER:
-	ap->a.a_count_longint_pointer = va_arg (args, long int *);
-	break;
+    case TYPE_POINTER:
+      ap->a.a_pointer = va_arg(args, void *);
+      break;
+    case TYPE_COUNT_SCHAR_POINTER:
+      ap->a.a_count_schar_pointer = va_arg(args, signed char *);
+      break;
+    case TYPE_COUNT_SHORT_POINTER:
+      ap->a.a_count_short_pointer = va_arg(args, short *);
+      break;
+    case TYPE_COUNT_INT_POINTER:
+      ap->a.a_count_int_pointer = va_arg(args, int *);
+      break;
+    case TYPE_COUNT_LONGINT_POINTER:
+      ap->a.a_count_longint_pointer = va_arg(args, long int *);
+      break;
 #if HAVE_LONG_LONG_INT
-      case TYPE_COUNT_LONGLONGINT_POINTER:
-	ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
-	break;
+    case TYPE_COUNT_LONGLONGINT_POINTER:
+      ap->a.a_count_longlongint_pointer = va_arg(args, long long int *);

LiVES-2.4.2.tar.bz2/intl/printf-args.h -> LiVES-2.4.3.tar.bz2/intl/printf-args.h Changed

@@ -47,8 +47,7 @@
 
 
 /* Argument types */
-typedef enum
-{
+typedef enum {
   TYPE_NONE,
   TYPE_SCHAR,
   TYPE_UCHAR,
@@ -78,22 +77,20 @@
   TYPE_COUNT_INT_POINTER,
   TYPE_COUNT_LONGINT_POINTER
 #if HAVE_LONG_LONG_INT
-, TYPE_COUNT_LONGLONGINT_POINTER
+  , TYPE_COUNT_LONGLONGINT_POINTER
 #endif
 #if ENABLE_UNISTDIO
   /* The unistdio extensions.  */
-, TYPE_U8_STRING
-, TYPE_U16_STRING
-, TYPE_U32_STRING
+  , TYPE_U8_STRING
+  , TYPE_U16_STRING
+  , TYPE_U32_STRING
 #endif
 } arg_type;
 
 /* Polymorphic argument */
-typedef struct
-{
+typedef struct {
   arg_type type;
-  union
-  {
+  union {
     signed char			a_schar;
     unsigned char		a_uchar;
     short			a_short;
@@ -113,31 +110,30 @@
 #if HAVE_WINT_T
     wint_t			a_wide_char;
 #endif
-    const char*			a_string;
+    const char			*a_string;
 #if HAVE_WCHAR_T
-    const wchar_t*		a_wide_string;
+    const wchar_t		*a_wide_string;
 #endif
-    void*			a_pointer;
-    signed char *		a_count_schar_pointer;
-    short *			a_count_short_pointer;
-    int *			a_count_int_pointer;
-    long int *			a_count_longint_pointer;
+    void			*a_pointer;
+    signed char 		*a_count_schar_pointer;
+    short 			*a_count_short_pointer;
+    int 			*a_count_int_pointer;
+    long int 			*a_count_longint_pointer;
 #if HAVE_LONG_LONG_INT
-    long long int *		a_count_longlongint_pointer;
+    long long int 		*a_count_longlongint_pointer;
 #endif
 #if ENABLE_UNISTDIO
     /* The unistdio extensions.  */
-    const uint8_t *		a_u8_string;
-    const uint16_t *		a_u16_string;
-    const uint32_t *		a_u32_string;
+    const uint8_t 		*a_u8_string;
+    const uint16_t 		*a_u16_string;
+    const uint32_t 		*a_u32_string;
 #endif
   }
   a;
 }
 argument;
 
-typedef struct
-{
+typedef struct {
   size_t count;
   argument *arg;
 }
@@ -150,6 +146,6 @@
 #else
 extern
 #endif
-int PRINTF_FETCHARGS (va_list args, arguments *a);
+int PRINTF_FETCHARGS(va_list args, arguments *a);
 
 #endif /* _PRINTF_ARGS_H */

LiVES-2.4.2.tar.bz2/intl/printf-parse.c -> LiVES-2.4.3.tar.bz2/intl/printf-parse.c Changed

@@ -79,8 +79,7 @@
 STATIC
 #endif
 int
-PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
-{
+PRINTF_PARSE(const CHAR_T *format, DIRECTIVES *d, arguments *a) {
   const CHAR_T *cp = format;		/* pointer into format */
   size_t arg_posn = 0;		/* number of regular arguments consumed */
   size_t d_allocated;			/* allocated elements of d->dir */
@@ -90,7 +89,7 @@
 
   d->count = 0;
   d_allocated = 1;
-  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
+  d->dir = (DIRECTIVE *) malloc(d_allocated * sizeof(DIRECTIVE));
   if (d->dir == NULL)
     /* Out of memory.  */
     goto out_of_memory_1;
@@ -131,434 +130,387 @@
       goto error;							\
   }
 
-  while (*cp != '\0')
-    {
-      CHAR_T c = *cp++;
-      if (c == '%')
-	{
-	  size_t arg_index = ARG_NONE;
-	  DIRECTIVE *dp = &d->dir[d->count]; /* pointer to next directive */
-
-	  /* Initialize the next directive.  */
-	  dp->dir_start = cp - 1;
-	  dp->flags = 0;
-	  dp->width_start = NULL;
-	  dp->width_end = NULL;
-	  dp->width_arg_index = ARG_NONE;
-	  dp->precision_start = NULL;
-	  dp->precision_end = NULL;
-	  dp->precision_arg_index = ARG_NONE;
-	  dp->arg_index = ARG_NONE;
-
-	  /* Test for positional argument.  */
-	  if (*cp >= '0' && *cp <= '9')
-	    {
-	      const CHAR_T *np;
-
-	      for (np = cp; *np >= '0' && *np <= '9'; np++)
-		;
-	      if (*np == '$')
-		{
-		  size_t n = 0;
-
-		  for (np = cp; *np >= '0' && *np <= '9'; np++)
-		    n = xsum (xtimes (n, 10), *np - '0');
-		  if (n == 0)
-		    /* Positional argument 0.  */
-		    goto error;
-		  if (size_overflow_p (n))
-		    /* n too large, would lead to out of memory later.  */
-		    goto error;
-		  arg_index = n - 1;
-		  cp = np + 1;
-		}
-	    }
-
-	  /* Read the flags.  */
-	  for (;;)
-	    {
-	      if (*cp == '\'')
-		{
-		  dp->flags |= FLAG_GROUP;
-		  cp++;
-		}
-	      else if (*cp == '-')
-		{
-		  dp->flags |= FLAG_LEFT;
-		  cp++;
-		}
-	      else if (*cp == '+')
-		{
-		  dp->flags |= FLAG_SHOWSIGN;
-		  cp++;
-		}
-	      else if (*cp == ' ')
-		{
-		  dp->flags |= FLAG_SPACE;
-		  cp++;
-		}
-	      else if (*cp == '#')
-		{
-		  dp->flags |= FLAG_ALT;
-		  cp++;
-		}
-	      else if (*cp == '0')
-		{
-		  dp->flags |= FLAG_ZERO;
-		  cp++;
-		}
-	      else
-		break;
-	    }
-
-	  /* Parse the field width.  */
-	  if (*cp == '*')
-	    {
-	      dp->width_start = cp;
-	      cp++;
-	      dp->width_end = cp;
-	      if (max_width_length < 1)
-		max_width_length = 1;
-
-	      /* Test for positional argument.  */
-	      if (*cp >= '0' && *cp <= '9')
-		{
-		  const CHAR_T *np;
-
-		  for (np = cp; *np >= '0' && *np <= '9'; np++)
-		    ;
-		  if (*np == '$')
-		    {
-		      size_t n = 0;
-
-		      for (np = cp; *np >= '0' && *np <= '9'; np++)
-			n = xsum (xtimes (n, 10), *np - '0');
-		      if (n == 0)
-			/* Positional argument 0.  */
-			goto error;
-		      if (size_overflow_p (n))
-			/* n too large, would lead to out of memory later.  */
-			goto error;
-		      dp->width_arg_index = n - 1;
-		      cp = np + 1;
-		    }
-		}
-	      if (dp->width_arg_index == ARG_NONE)
-		{
-		  dp->width_arg_index = arg_posn++;
-		  if (dp->width_arg_index == ARG_NONE)
-		    /* arg_posn wrapped around.  */
-		    goto error;
-		}
-	      REGISTER_ARG (dp->width_arg_index, TYPE_INT);
-	    }
-	  else if (*cp >= '0' && *cp <= '9')
-	    {
-	      size_t width_length;
-
-	      dp->width_start = cp;
-	      for (; *cp >= '0' && *cp <= '9'; cp++)
-		;
-	      dp->width_end = cp;
-	      width_length = dp->width_end - dp->width_start;
-	      if (max_width_length < width_length)
-		max_width_length = width_length;
-	    }
-
-	  /* Parse the precision.  */
-	  if (*cp == '.')
-	    {
-	      cp++;
-	      if (*cp == '*')
-		{
-		  dp->precision_start = cp - 1;
-		  cp++;
-		  dp->precision_end = cp;
-		  if (max_precision_length < 2)
-		    max_precision_length = 2;
-
-		  /* Test for positional argument.  */
-		  if (*cp >= '0' && *cp <= '9')
-		    {
-		      const CHAR_T *np;
-
-		      for (np = cp; *np >= '0' && *np <= '9'; np++)
-			;
-		      if (*np == '$')
-			{
-			  size_t n = 0;
-
-			  for (np = cp; *np >= '0' && *np <= '9'; np++)
-			    n = xsum (xtimes (n, 10), *np - '0');
-			  if (n == 0)
-			    /* Positional argument 0.  */
-			    goto error;
-			  if (size_overflow_p (n))
-			    /* n too large, would lead to out of memory
-			       later.  */
-			    goto error;
-			  dp->precision_arg_index = n - 1;
-			  cp = np + 1;
-			}
-		    }
-		  if (dp->precision_arg_index == ARG_NONE)
-		    {
-		      dp->precision_arg_index = arg_posn++;
-		      if (dp->precision_arg_index == ARG_NONE)
-			/* arg_posn wrapped around.  */
-			goto error;
-		    }

LiVES-2.4.2.tar.bz2/intl/printf-parse.h -> LiVES-2.4.3.tar.bz2/intl/printf-parse.h Changed

@@ -34,16 +34,15 @@
 #define ARG_NONE	(~(size_t)0)
 
 /* A parsed directive.  */
-typedef struct
-{
-  const char* dir_start;
-  const char* dir_end;
+typedef struct {
+  const char *dir_start;
+  const char *dir_end;
   int flags;
-  const char* width_start;
-  const char* width_end;
+  const char *width_start;
+  const char *width_end;
   size_t width_arg_index;
-  const char* precision_start;
-  const char* precision_end;
+  const char *precision_start;
+  const char *precision_end;
   size_t precision_arg_index;
   char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
   size_t arg_index;
@@ -51,8 +50,7 @@
 char_directive;
 
 /* A parsed format string.  */
-typedef struct
-{
+typedef struct {
   size_t count;
   char_directive *dir;
   size_t max_width_length;
@@ -70,6 +68,6 @@
 #else
 extern
 #endif
-int printf_parse (const char *format, char_directives *d, arguments *a);
+int printf_parse(const char *format, char_directives *d, arguments *a);
 
 #endif /* _PRINTF_PARSE_H */

LiVES-2.4.2.tar.bz2/intl/printf.c -> LiVES-2.4.3.tar.bz2/intl/printf.c Changed

@@ -33,10 +33,10 @@
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
- #pragma alloca
+#pragma alloca
 #   else
 #    ifndef alloca
-char *alloca ();
+char *alloca();
 #    endif
 #   endif
 #  endif
@@ -92,153 +92,133 @@
 
 DLL_EXPORTED
 int
-libintl_vfprintf (FILE *stream, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return vfprintf (stream, format, args);
-  else
-    {
-      size_t length;
-      char *result = libintl_vasnprintf (NULL, &length, format, args);
-      int retval = -1;
-      if (result != NULL)
-	{
-	  size_t written = fwrite (result, 1, length, stream);
-	  free (result);
-	  if (written == length)
-	    {
-	      if (length > INT_MAX)
-		errno = EOVERFLOW;
-	      else
-		retval = length;
-	    }
-	}
-      return retval;
+libintl_vfprintf(FILE *stream, const char *format, va_list args) {
+  if (strchr(format, '$') == NULL)
+    return vfprintf(stream, format, args);
+  else {
+    size_t length;
+    char *result = libintl_vasnprintf(NULL, &length, format, args);
+    int retval = -1;
+    if (result != NULL) {
+      size_t written = fwrite(result, 1, length, stream);
+      free(result);
+      if (written == length) {
+        if (length > INT_MAX)
+          errno = EOVERFLOW;
+        else
+          retval = length;
+      }
     }
+    return retval;
+  }
 }
 
 DLL_EXPORTED
 int
-libintl_fprintf (FILE *stream, const char *format, ...)
-{
+libintl_fprintf(FILE *stream, const char *format, ...) {
   va_list args;
   int retval;
 
-  va_start (args, format);
-  retval = libintl_vfprintf (stream, format, args);
-  va_end (args);
+  va_start(args, format);
+  retval = libintl_vfprintf(stream, format, args);
+  va_end(args);
   return retval;
 }
 
 DLL_EXPORTED
 int
-libintl_vprintf (const char *format, va_list args)
-{
-  return libintl_vfprintf (stdout, format, args);
+libintl_vprintf(const char *format, va_list args) {
+  return libintl_vfprintf(stdout, format, args);
 }
 
 DLL_EXPORTED
 int
-libintl_printf (const char *format, ...)
-{
+libintl_printf(const char *format, ...) {
   va_list args;
   int retval;
 
-  va_start (args, format);
-  retval = libintl_vprintf (format, args);
-  va_end (args);
+  va_start(args, format);
+  retval = libintl_vprintf(format, args);
+  va_end(args);
   return retval;
 }
 
 DLL_EXPORTED
 int
-libintl_vsprintf (char *resultbuf, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return vsprintf (resultbuf, format, args);
-  else
-    {
-      size_t length = (size_t) ~0 / (4 * sizeof (char));
-      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-      if (result != resultbuf)
-	{
-	  free (result);
-	  return -1;
-	}
-      if (length > INT_MAX)
-	{
-	  errno = EOVERFLOW;
-	  return -1;
-	}
-      else
-	return length;
+libintl_vsprintf(char *resultbuf, const char *format, va_list args) {
+  if (strchr(format, '$') == NULL)
+    return vsprintf(resultbuf, format, args);
+  else {
+    size_t length = (size_t) ~0 / (4 * sizeof(char));
+    char *result = libintl_vasnprintf(resultbuf, &length, format, args);
+    if (result != resultbuf) {
+      free(result);
+      return -1;
     }
+    if (length > INT_MAX) {
+      errno = EOVERFLOW;
+      return -1;
+    } else
+      return length;
+  }
 }
 
 DLL_EXPORTED
 int
-libintl_sprintf (char *resultbuf, const char *format, ...)
-{
+libintl_sprintf(char *resultbuf, const char *format, ...) {
   va_list args;
   int retval;
 
-  va_start (args, format);
-  retval = libintl_vsprintf (resultbuf, format, args);
-  va_end (args);
+  va_start(args, format);
+  retval = libintl_vsprintf(resultbuf, format, args);
+  va_end(args);
   return retval;
 }
 
 #if HAVE_SNPRINTF
 
 # if HAVE_DECL__SNPRINTF
-   /* Windows.  */
+/* Windows.  */
 #  define system_vsnprintf _vsnprintf
 # else
-   /* Unix.  */
+/* Unix.  */
 #  define system_vsnprintf vsnprintf
 # endif
 
 DLL_EXPORTED
 int
-libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
-{
-  if (strchr (format, '$') == NULL)
-    return system_vsnprintf (resultbuf, length, format, args);
-  else
-    {
-      size_t maxlength = length;
-      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-      if (result != resultbuf)
-	{
-	  if (maxlength > 0)
-	    {
-	      size_t pruned_length =
-		(length < maxlength ? length : maxlength - 1);
-	      memcpy (resultbuf, result, pruned_length);
-	      resultbuf[pruned_length] = '\0';
-	    }
-	  free (result);
-	}
-      if (length > INT_MAX)
-	{
-	  errno = EOVERFLOW;
-	  return -1;
-	}
-      else
-	return length;

LiVES-2.4.2.tar.bz2/intl/relocatable.c -> LiVES-2.4.3.tar.bz2/intl/relocatable.c Changed

@@ -71,7 +71,7 @@
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+/* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -80,7 +80,7 @@
     (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
 # define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
 #else
-  /* Unix */
+/* Unix */
 # define ISSLASH(C) ((C) == '/')
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
@@ -101,32 +101,30 @@
    prefixes should be directory names without trailing slash (i.e. use ""
    instead of "/").  */
 static void
-set_this_relocation_prefix (const char *orig_prefix_arg,
-			    const char *curr_prefix_arg)
-{
+set_this_relocation_prefix(const char *orig_prefix_arg,
+                           const char *curr_prefix_arg) {
   if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
       /* Optimization: if orig_prefix and curr_prefix are equal, the
-	 relocation is a nop.  */
-      && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
-    {
-      /* Duplicate the argument strings.  */
-      char *memory;
-
-      orig_prefix_len = strlen (orig_prefix_arg);
-      curr_prefix_len = strlen (curr_prefix_arg);
-      memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
+      relocation is a nop.  */
+      && strcmp(orig_prefix_arg, curr_prefix_arg) != 0) {
+    /* Duplicate the argument strings.  */
+    char *memory;
+
+    orig_prefix_len = strlen(orig_prefix_arg);
+    curr_prefix_len = strlen(curr_prefix_arg);
+    memory = (char *) xmalloc(orig_prefix_len + 1 + curr_prefix_len + 1);
 #ifdef NO_XMALLOC
-      if (memory != NULL)
+    if (memory != NULL)
 #endif
-	{
-	  memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
-	  orig_prefix = memory;
-	  memory += orig_prefix_len + 1;
-	  memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
-	  curr_prefix = memory;
-	  return;
-	}
+    {
+      memcpy(memory, orig_prefix_arg, orig_prefix_len + 1);
+      orig_prefix = memory;
+      memory += orig_prefix_len + 1;
+      memcpy(memory, curr_prefix_arg, curr_prefix_len + 1);
+      curr_prefix = memory;
+      return;
     }
+  }
   orig_prefix = NULL;
   curr_prefix = NULL;
   /* Don't worry about wasted memory here - this function is usually only
@@ -139,19 +137,18 @@
    prefixes should be directory names without trailing slash (i.e. use ""
    instead of "/").  */
 void
-set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
-{
-  set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+set_relocation_prefix(const char *orig_prefix_arg, const char *curr_prefix_arg) {
+  set_this_relocation_prefix(orig_prefix_arg, curr_prefix_arg);
 
   /* Now notify all dependent libraries.  */
 #if DEPENDS_ON_LIBCHARSET
-  libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+  libcharset_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg);
 #endif
 #if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
-  libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+  libiconv_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg);
 #endif
 #if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
-  libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+  libintl_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg);
 #endif
 }
 
@@ -166,10 +163,9 @@
 static
 #endif
 const char *
-compute_curr_prefix (const char *orig_installprefix,
-		     const char *orig_installdir,
-		     const char *curr_pathname)
-{
+compute_curr_prefix(const char *orig_installprefix,
+                    const char *orig_installdir,
+                    const char *curr_pathname) {
   const char *curr_installdir;
   const char *rel_installdir;
 
@@ -179,31 +175,30 @@
   /* Determine the relative installation directory, relative to the prefix.
      This is simply the difference between orig_installprefix and
      orig_installdir.  */
-  if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
+  if (strncmp(orig_installprefix, orig_installdir, strlen(orig_installprefix))
       != 0)
     /* Shouldn't happen - nothing should be installed outside $(prefix).  */
     return NULL;
-  rel_installdir = orig_installdir + strlen (orig_installprefix);
+  rel_installdir = orig_installdir + strlen(orig_installprefix);
 
   /* Determine the current installation directory.  */
   {
-    const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
-    const char *p = curr_pathname + strlen (curr_pathname);
+    const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN(curr_pathname);
+    const char *p = curr_pathname + strlen(curr_pathname);
     char *q;
 
-    while (p > p_base)
-      {
-	p--;
-	if (ISSLASH (*p))
-	  break;
-      }
+    while (p > p_base) {
+      p--;
+      if (ISSLASH(*p))
+        break;
+    }
 
-    q = (char *) xmalloc (p - curr_pathname + 1);
+    q = (char *) xmalloc(p - curr_pathname + 1);
 #ifdef NO_XMALLOC
     if (q == NULL)
       return NULL;
 #endif
-    memcpy (q, curr_pathname, p - curr_pathname);
+    memcpy(q, curr_pathname, p - curr_pathname);
     q[p - curr_pathname] = '\0';
     curr_installdir = q;
   }
@@ -211,47 +206,44 @@
   /* Compute the current installation prefix by removing the trailing
      rel_installdir from it.  */
   {
-    const char *rp = rel_installdir + strlen (rel_installdir);
-    const char *cp = curr_installdir + strlen (curr_installdir);
+    const char *rp = rel_installdir + strlen(rel_installdir);
+    const char *cp = curr_installdir + strlen(curr_installdir);
     const char *cp_base =
-      curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
-
-    while (rp > rel_installdir && cp > cp_base)
-      {
-	bool same = false;
-	const char *rpi = rp;
-	const char *cpi = cp;
-
-	while (rpi > rel_installdir && cpi > cp_base)
-	  {
-	    rpi--;
-	    cpi--;
-	    if (ISSLASH (*rpi) || ISSLASH (*cpi))
-	      {
-		if (ISSLASH (*rpi) && ISSLASH (*cpi))
-		  same = true;
-		break;
-	      }
-	    /* Do case-insensitive comparison if the filesystem is always or
-	       often case-insensitive.  It's better to accept the comparison
-	       if the difference is only in case, rather than to fail.  */
+      curr_installdir + FILE_SYSTEM_PREFIX_LEN(curr_installdir);
+
+    while (rp > rel_installdir && cp > cp_base) {
+      bool same = false;
+      const char *rpi = rp;
+      const char *cpi = cp;
+
+      while (rpi > rel_installdir && cpi > cp_base) {
+        rpi--;
+        cpi--;
+        if (ISSLASH(*rpi) || ISSLASH(*cpi)) {
+          if (ISSLASH(*rpi) && ISSLASH(*cpi))
+            same = true;
+          break;
+        }
+        /* Do case-insensitive comparison if the filesystem is always or
+           often case-insensitive.  It's better to accept the comparison
+           if the difference is only in case, rather than to fail.  */

LiVES-2.4.2.tar.bz2/intl/relocatable.h -> LiVES-2.4.3.tar.bz2/intl/relocatable.h Changed

@@ -45,12 +45,12 @@
    prefixes should be directory names without trailing slash (i.e. use ""
    instead of "/").  */
 extern RELOCATABLE_DLL_EXPORTED void
-       set_relocation_prefix (const char *orig_prefix,
-			      const char *curr_prefix);
+set_relocation_prefix(const char *orig_prefix,
+                      const char *curr_prefix);
 
 /* Returns the pathname, relocated according to the current installation
    directory.  */
-extern const char * relocate (const char *pathname);
+extern const char *relocate(const char *pathname);
 
 /* Memory management: relocate() leaks memory, because it has to construct
    a fresh pathname.  If this is a problem because your program calls
@@ -60,9 +60,9 @@
    Computes the current installation prefix, based on the original
    installation prefix, the original installation directory of a particular
    file, and the current pathname of this file.  Returns NULL upon failure.  */
-extern const char * compute_curr_prefix (const char *orig_installprefix,
-					 const char *orig_installdir,
-					 const char *curr_pathname);
+extern const char *compute_curr_prefix(const char *orig_installprefix,
+                                       const char *orig_installdir,
+                                       const char *curr_pathname);
 
 #else

LiVES-2.4.2.tar.bz2/intl/textdomain.c -> LiVES-2.4.3.tar.bz2/intl/textdomain.c Changed

@@ -57,14 +57,13 @@
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
+gl_rwlock_define(extern, _nl_state_lock attribute_hidden)
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
 char *
-TEXTDOMAIN (const char *domainname)
-{
+TEXTDOMAIN(const char *domainname) {
   char *new_domain;
   char *old_domain;
 
@@ -72,56 +71,52 @@
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  gl_rwlock_wrlock (_nl_state_lock);
+  gl_rwlock_wrlock(_nl_state_lock);
 
   old_domain = (char *) _nl_current_default_domain;
 
   /* If domain name is the null string set to default domain "messages".  */
   if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
+      || strcmp(domainname, _nl_default_default_domain) == 0) {
+    _nl_current_default_domain = _nl_default_default_domain;
+    new_domain = (char *) _nl_current_default_domain;
+  } else if (strcmp(domainname, old_domain) == 0)
     /* This can happen and people will use it to signal that some
        environment variable changed.  */
     new_domain = old_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
+  else {
+    /* If the following malloc fails `_nl_current_default_domain'
+    will be NULL.  This value will be returned and so signals we
+    are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
+    new_domain = strdup(domainname);
 #else
-      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
+    size_t len = strlen(domainname) + 1;
+    new_domain = (char *) malloc(len);
+    if (new_domain != NULL)
+      memcpy(new_domain, domainname, len);
 #endif
 
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
-    }
+    if (new_domain != NULL)
+      _nl_current_default_domain = new_domain;
+  }
 
   /* We use this possibility to signal a change of the loaded catalogs
      since this is most likely the case and there is no other easy we
      to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
+  if (new_domain != NULL) {
+    ++_nl_msg_cat_cntr;
 
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
+    if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+      free(old_domain);
+  }
 
-  gl_rwlock_unlock (_nl_state_lock);
+  gl_rwlock_unlock(_nl_state_lock);
 
   return new_domain;
 }
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
+weak_alias(__textdomain, textdomain);
 #endif

LiVES-2.4.2.tar.bz2/intl/tsearch.c -> LiVES-2.4.3.tar.bz2/intl/tsearch.c Changed

@@ -97,8 +97,8 @@
 
 #include <stdlib.h>
 
-typedef int (*__compar_fn_t) (const void *, const void *);
-typedef void (*__action_fn_t) (const void *, VISIT, int);
+typedef int (*__compar_fn_t)(const void *, const void *);
+typedef void (*__action_fn_t)(const void *, VISIT, int);
 
 #ifndef weak_alias
 # define __tsearch tsearch
@@ -113,8 +113,7 @@
 # define internal_function
 #endif
 
-typedef struct node_t
-{
+typedef struct node_t {
   /* Callers expect this to be the first element in the structure - do not
      move!  */
   const void *key;
@@ -135,33 +134,30 @@
 #define CHECK_TREE(a) check_tree(a)
 
 static void
-check_tree_recurse (node p, int d_sofar, int d_total)
-{
-  if (p == NULL)
-    {
-      assert (d_sofar == d_total);
-      return;
-    }
+check_tree_recurse(node p, int d_sofar, int d_total) {
+  if (p == NULL) {
+    assert(d_sofar == d_total);
+    return;
+  }
 
-  check_tree_recurse (p->left, d_sofar + (p->left && !p->left->red), d_total);
-  check_tree_recurse (p->right, d_sofar + (p->right && !p->right->red), d_total);
+  check_tree_recurse(p->left, d_sofar + (p->left && !p->left->red), d_total);
+  check_tree_recurse(p->right, d_sofar + (p->right && !p->right->red), d_total);
   if (p->left)
-    assert (!(p->left->red && p->red));
+    assert(!(p->left->red && p->red));
   if (p->right)
-    assert (!(p->right->red && p->red));
+    assert(!(p->right->red && p->red));
 }
 
 static void
-check_tree (node root)
-{
+check_tree(node root) {
   int cnt = 0;
   node p;
   if (root == NULL)
     return;
   root->red = 0;
-  for(p = root->left; p; p = p->left)
+  for (p = root->left; p; p = p->left)
     cnt += !p->red;
-  check_tree_recurse (root, 0, cnt);
+  check_tree_recurse(root, 0, cnt);
 }
 
 
@@ -178,9 +174,8 @@
    ROOTP.  MODE is 1 if we need not do the split, but must check for two red
    edges between GPARENTP and ROOTP.  */
 static void
-maybe_split_for_insert (node *rootp, node *parentp, node *gparentp,
-			int p_r, int gp_r, int mode)
-{
+maybe_split_for_insert(node *rootp, node *parentp, node *gparentp,
+                       int p_r, int gp_r, int mode) {
   node root = *rootp;
   node *rp, *lp;
   rp = &(*rootp)->right;
@@ -188,81 +183,69 @@
 
   /* See if we have to split this node (both successors red).  */
   if (mode == 1
-      || ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red))
-    {
-      /* This node becomes red, its successors black.  */
-      root->red = 1;
-      if (*rp)
-	(*rp)->red = 0;
-      if (*lp)
-	(*lp)->red = 0;
-
-      /* If the parent of this node is also red, we have to do
-	 rotations.  */
-      if (parentp != NULL && (*parentp)->red)
-	{
-	  node gp = *gparentp;
-	  node p = *parentp;
-	  /* There are two main cases:
-	     1. The edge types (left or right) of the two red edges differ.
-	     2. Both red edges are of the same type.
-	     There exist two symmetries of each case, so there is a total of
-	     4 cases.  */
-	  if ((p_r > 0) != (gp_r > 0))
-	    {
-	      /* Put the child at the top of the tree, with its parent
-		 and grandparent as successors.  */
-	      p->red = 1;
-	      gp->red = 1;
-	      root->red = 0;
-	      if (p_r < 0)
-		{
-		  /* Child is left of parent.  */
-		  p->left = *rp;
-		  *rp = p;
-		  gp->right = *lp;
-		  *lp = gp;
-		}
-	      else
-		{
-		  /* Child is right of parent.  */
-		  p->right = *lp;
-		  *lp = p;
-		  gp->left = *rp;
-		  *rp = gp;
-		}
-	      *gparentp = root;
-	    }
-	  else
-	    {
-	      *gparentp = *parentp;
-	      /* Parent becomes the top of the tree, grandparent and
-		 child are its successors.  */
-	      p->red = 0;
-	      gp->red = 1;
-	      if (p_r < 0)
-		{
-		  /* Left edges.  */
-		  gp->left = p->right;
-		  p->right = gp;
-		}
-	      else
-		{
-		  /* Right edges.  */
-		  gp->right = p->left;
-		  p->left = gp;
-		}
-	    }
-	}
+      || ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red)) {
+    /* This node becomes red, its successors black.  */
+    root->red = 1;
+    if (*rp)
+      (*rp)->red = 0;
+    if (*lp)
+      (*lp)->red = 0;
+
+    /* If the parent of this node is also red, we have to do
+    rotations.  */
+    if (parentp != NULL && (*parentp)->red) {
+      node gp = *gparentp;
+      node p = *parentp;
+      /* There are two main cases:
+         1. The edge types (left or right) of the two red edges differ.
+         2. Both red edges are of the same type.
+         There exist two symmetries of each case, so there is a total of
+         4 cases.  */
+      if ((p_r > 0) != (gp_r > 0)) {
+        /* Put the child at the top of the tree, with its parent
+        and grandparent as successors.  */
+        p->red = 1;
+        gp->red = 1;
+        root->red = 0;
+        if (p_r < 0) {
+          /* Child is left of parent.  */
+          p->left = *rp;
+          *rp = p;
+          gp->right = *lp;
+          *lp = gp;
+        } else {
+          /* Child is right of parent.  */
+          p->right = *lp;
+          *lp = p;
+          gp->left = *rp;
+          *rp = gp;
+        }
+        *gparentp = root;
+      } else {
+        *gparentp = *parentp;
+        /* Parent becomes the top of the tree, grandparent and
+        child are its successors.  */
+        p->red = 0;
+        gp->red = 1;
+        if (p_r < 0) {
+          /* Left edges.  */
+          gp->left = p->right;
+          p->right = gp;
+        } else {
+          /* Right edges.  */
+          gp->right = p->left;

LiVES-2.4.2.tar.bz2/intl/tsearch.h -> LiVES-2.4.3.tar.bz2/intl/tsearch.h Changed

@@ -30,49 +30,49 @@
 extern "C" {
 #endif
 
-/* See <http://www.opengroup.org/susv3xbd/search.h.html>,
-       <http://www.opengroup.org/susv3xsh/tsearch.html>
-   for details.  */
-
-typedef enum
-{ 
-  preorder,
-  postorder, 
-  endorder,
-  leaf
-}
-VISIT;
-
-/* Searches an element in the tree *VROOTP that compares equal to KEY.
-   If one is found, it is returned.  Otherwise, a new element equal to KEY
-   is inserted in the tree and is returned.  */
-extern void * tsearch (const void *key, void **vrootp,
-		       int (*compar) (const void *, const void *));
-
-/* Searches an element in the tree *VROOTP that compares equal to KEY.
-   If one is found, it is returned.  Otherwise, NULL is returned.  */
-extern void * tfind (const void *key, void *const *vrootp,
-		     int (*compar) (const void *, const void *));
-
-/* Searches an element in the tree *VROOTP that compares equal to KEY.
-   If one is found, it is removed from the tree, and its parent node is
-   returned.  Otherwise, NULL is returned.  */
-extern void * tdelete (const void *key, void **vrootp,
-		       int (*compar) (const void *, const void *));
-
-/* Perform a depth-first, left-to-right traversal of the tree VROOT.
-   The ACTION function is called:
-     - for non-leaf nodes: 3 times, before the left subtree traversal,
-       after the left subtree traversal but before the right subtree traversal,
-       and after the right subtree traversal,
-     - for leaf nodes: once.
-   The arguments passed to ACTION are:
-     1. the node; it can be casted to a 'const void * const *', i.e. into a
-        pointer to the key,
-     2. an indicator which visit of the node this is,
-     3. the level of the node in the tree (0 for the root).  */
-extern void twalk (const void *vroot,
-		   void (*action) (const void *, VISIT, int));
+  /* See <http://www.opengroup.org/susv3xbd/search.h.html>,
+         <http://www.opengroup.org/susv3xsh/tsearch.html>
+     for details.  */
+
+  typedef enum
+  {
+    preorder,
+    postorder,
+    endorder,
+    leaf
+  }
+  VISIT;
+
+  /* Searches an element in the tree *VROOTP that compares equal to KEY.
+     If one is found, it is returned.  Otherwise, a new element equal to KEY
+     is inserted in the tree and is returned.  */
+  extern void *tsearch(const void *key, void **vrootp,
+                       int (*compar)(const void *, const void *));
+
+  /* Searches an element in the tree *VROOTP that compares equal to KEY.
+     If one is found, it is returned.  Otherwise, NULL is returned.  */
+  extern void *tfind(const void *key, void *const *vrootp,
+                     int (*compar)(const void *, const void *));
+
+  /* Searches an element in the tree *VROOTP that compares equal to KEY.
+     If one is found, it is removed from the tree, and its parent node is
+     returned.  Otherwise, NULL is returned.  */
+  extern void *tdelete(const void *key, void **vrootp,
+                       int (*compar)(const void *, const void *));
+
+  /* Perform a depth-first, left-to-right traversal of the tree VROOT.
+     The ACTION function is called:
+       - for non-leaf nodes: 3 times, before the left subtree traversal,
+         after the left subtree traversal but before the right subtree traversal,
+         and after the right subtree traversal,
+       - for leaf nodes: once.
+     The arguments passed to ACTION are:
+       1. the node; it can be casted to a 'const void * const *', i.e. into a
+          pointer to the key,
+       2. an indicator which visit of the node this is,
+       3. the level of the node in the tree (0 for the root).  */
+  extern void twalk(const void *vroot,
+                    void (*action)(const void *, VISIT, int));
 
 #ifdef __cplusplus
 }

LiVES-2.4.2.tar.bz2/intl/vasnprintf.c -> LiVES-2.4.3.tar.bz2/intl/vasnprintf.c Changed

@@ -127,15 +127,14 @@
 # if HAVE_WCSLEN
 #  define local_wcslen wcslen
 # else
-   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
-      a dependency towards this library, here is a local substitute.
-      Define this substitute only once, even if this file is included
-      twice in the same compilation unit.  */
+/* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+   a dependency towards this library, here is a local substitute.
+   Define this substitute only once, even if this file is included
+   twice in the same compilation unit.  */
 #  ifndef local_wcslen_defined
 #   define local_wcslen_defined 1
 static size_t
-local_wcslen (const wchar_t *s)
-{
+local_wcslen(const wchar_t *s) {
   const wchar_t *ptr;
 
   for (ptr = s; *ptr != (wchar_t) 0; ptr++)
@@ -171,18 +170,18 @@
 # endif
 #endif
 #if WIDE_CHAR_VERSION
-  /* TCHAR_T is wchar_t.  */
+/* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
 # if HAVE_DECL__SNWPRINTF
-   /* On Windows, the function swprintf() has a different signature than
-      on Unix; we use the _snwprintf() function instead.  */
+/* On Windows, the function swprintf() has a different signature than
+   on Unix; we use the _snwprintf() function instead.  */
 #  define SNPRINTF _snwprintf
 # else
-   /* Unix.  */
+/* Unix.  */
 #  define SNPRINTF swprintf
 # endif
 #else
-  /* TCHAR_T is char.  */
+/* TCHAR_T is char.  */
 # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'.
      But don't use it on BeOS, since BeOS snprintf produces no output if the
      size argument is >= 0x3000000.  */
@@ -192,12 +191,12 @@
 #  define USE_SNPRINTF 0
 # endif
 # if HAVE_DECL__SNPRINTF
-   /* Windows.  */
+/* Windows.  */
 #  define SNPRINTF _snprintf
 # else
-   /* Unix.  */
+/* Unix.  */
 #  define SNPRINTF snprintf
-   /* Here we need to call the native snprintf, not rpl_snprintf.  */
+/* Here we need to call the native snprintf, not rpl_snprintf.  */
 #  undef snprintf
 # endif
 #endif
@@ -209,21 +208,20 @@
 # ifndef decimal_point_char_defined
 #  define decimal_point_char_defined 1
 static char
-decimal_point_char ()
-{
+decimal_point_char() {
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
      multithread-safe on glibc systems, but is not required to be multithread-
      safe by POSIX.  sprintf(), however, is multithread-safe.  localeconv()
      is rarely multithread-safe.  */
 #  if HAVE_NL_LANGINFO && __GLIBC__
-  point = nl_langinfo (RADIXCHAR);
+  point = nl_langinfo(RADIXCHAR);
 #  elif 1
   char pointbuf[5];
-  sprintf (pointbuf, "%#.0f", 1.0);
+  sprintf(pointbuf, "%#.0f", 1.0);
   point = &pointbuf[1];
 #  else
-  point = localeconv () -> decimal_point;
+  point = localeconv() -> decimal_point;
 #  endif
   /* The decimal point is always a single byte: either '.' or ','.  */
   return (point[0] != '\0' ? point[0] : '.');
@@ -235,9 +233,8 @@
 
 /* Equivalent to !isfinite(x) || x == 0, but does not require libm.  */
 static int
-is_infinite_or_zero (double x)
-{
-  return isnan (x) || x + x == x;
+is_infinite_or_zero(double x) {
+  return isnan(x) || x + x == x;
 }
 
 #endif
@@ -246,9 +243,8 @@
 
 /* Equivalent to !isfinite(x), but does not require libm.  */
 static int
-is_infinitel (long double x)
-{
-  return isnanl (x) || (x + x == x && x != 0.0L);
+is_infinitel(long double x) {
+  return isnanl(x) || (x + x == x && x != 0.0L);
 }
 
 #endif
@@ -261,15 +257,14 @@
 
 typedef unsigned int mp_limb_t;
 # define GMP_LIMB_BITS 32
-typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
+typedef int mp_limb_verify[2 * (sizeof(mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1];
 
 typedef unsigned long long mp_twolimb_t;
 # define GMP_TWOLIMB_BITS 64
-typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
+typedef int mp_twolimb_verify[2 * (sizeof(mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1];
 
 /* Representation of a bignum >= 0.  */
-typedef struct
-{
+typedef struct {
   size_t nlimbs;
   mp_limb_t *limbs; /* Bits in little-endian order, allocated with malloc().  */
 } mpn_t;
@@ -278,67 +273,58 @@
    Return the allocated memory in case of success, NULL in case of memory
    allocation failure.  */
 static void *
-multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
-{
+multiply(mpn_t src1, mpn_t src2, mpn_t *dest) {
   const mp_limb_t *p1;
   const mp_limb_t *p2;
   size_t len1;
   size_t len2;
 
-  if (src1.nlimbs <= src2.nlimbs)
-    {
-      len1 = src1.nlimbs;
-      p1 = src1.limbs;
-      len2 = src2.nlimbs;
-      p2 = src2.limbs;
-    }
-  else
-    {
-      len1 = src2.nlimbs;
-      p1 = src2.limbs;
-      len2 = src1.nlimbs;
-      p2 = src1.limbs;
-    }
+  if (src1.nlimbs <= src2.nlimbs) {
+    len1 = src1.nlimbs;
+    p1 = src1.limbs;
+    len2 = src2.nlimbs;
+    p2 = src2.limbs;
+  } else {
+    len1 = src2.nlimbs;
+    p1 = src2.limbs;
+    len2 = src1.nlimbs;
+    p2 = src1.limbs;
+  }
   /* Now 0 <= len1 <= len2.  */
-  if (len1 == 0)
-    {
-      /* src1 or src2 is zero.  */
-      dest->nlimbs = 0;
-      dest->limbs = (mp_limb_t *) malloc (1);
-    }
-  else
-    {
-      /* Here 1 <= len1 <= len2.  */
-      size_t dlen;
-      mp_limb_t *dp;
-      size_t k, i, j;
-
-      dlen = len1 + len2;
-      dp = (mp_limb_t *) malloc (dlen * sizeof (mp_limb_t));
-      if (dp == NULL)
-	return NULL;
-      for (k = len2; k > 0; )
-	dp[--k] = 0;
-      for (i = 0; i < len1; i++)
-	{
-	  mp_limb_t digit1 = p1[i];
-	  mp_twolimb_t carry = 0;
-	  for (j = 0; j < len2; j++)
-	    {
-	      mp_limb_t digit2 = p2[j];
-	      carry += (mp_twolimb_t) digit1 * (mp_twolimb_t) digit2;
-	      carry += dp[i + j];
-	      dp[i + j] = (mp_limb_t) carry;
-	      carry = carry >> GMP_LIMB_BITS;
-	    }
-	  dp[i + len2] = (mp_limb_t) carry;

LiVES-2.4.2.tar.bz2/intl/vasnprintf.h -> LiVES-2.4.3.tar.bz2/intl/vasnprintf.h Changed

LiVES-2.4.2.tar.bz2/intl/vasnwprintf.h -> LiVES-2.4.3.tar.bz2/intl/vasnwprintf.h Changed

LiVES-2.4.2.tar.bz2/intl/wprintf-parse.h -> LiVES-2.4.3.tar.bz2/intl/wprintf-parse.h Changed

@@ -34,16 +34,15 @@
 #define ARG_NONE	(~(size_t)0)
 
 /* A parsed directive.  */
-typedef struct
-{
-  const wchar_t* dir_start;
-  const wchar_t* dir_end;
+typedef struct {
+  const wchar_t *dir_start;
+  const wchar_t *dir_end;
   int flags;
-  const wchar_t* width_start;
-  const wchar_t* width_end;
+  const wchar_t *width_start;
+  const wchar_t *width_end;
   size_t width_arg_index;
-  const wchar_t* precision_start;
-  const wchar_t* precision_end;
+  const wchar_t *precision_start;
+  const wchar_t *precision_end;
   size_t precision_arg_index;
   wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
   size_t arg_index;
@@ -51,8 +50,7 @@
 wchar_t_directive;
 
 /* A parsed format string.  */
-typedef struct
-{
+typedef struct {
   size_t count;
   wchar_t_directive *dir;
   size_t max_width_length;
@@ -70,6 +68,6 @@
 #else
 extern
 #endif
-int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
+int wprintf_parse(const wchar_t *format, wchar_t_directives *d, arguments *a);
 
 #endif /* _WPRINTF_PARSE_H */

LiVES-2.4.2.tar.bz2/intl/xsize.h -> LiVES-2.4.3.tar.bz2/intl/xsize.h Changed

@@ -52,10 +52,9 @@
 /* Sum of two sizes, with overflow check.  */
 static inline size_t
 #if __GNUC__ >= 3
-__attribute__ ((__pure__))
+__attribute__((__pure__))
 #endif
-xsum (size_t size1, size_t size2)
-{
+xsum(size_t size1, size_t size2) {
   size_t sum = size1 + size2;
   return (sum >= size1 ? sum : SIZE_MAX);
 }
@@ -63,30 +62,27 @@
 /* Sum of three sizes, with overflow check.  */
 static inline size_t
 #if __GNUC__ >= 3
-__attribute__ ((__pure__))
+__attribute__((__pure__))
 #endif
-xsum3 (size_t size1, size_t size2, size_t size3)
-{
-  return xsum (xsum (size1, size2), size3);
+xsum3(size_t size1, size_t size2, size_t size3) {
+  return xsum(xsum(size1, size2), size3);
 }
 
 /* Sum of four sizes, with overflow check.  */
 static inline size_t
 #if __GNUC__ >= 3
-__attribute__ ((__pure__))
+__attribute__((__pure__))
 #endif
-xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
-{
-  return xsum (xsum (xsum (size1, size2), size3), size4);
+xsum4(size_t size1, size_t size2, size_t size3, size_t size4) {
+  return xsum(xsum(xsum(size1, size2), size3), size4);
 }
 
 /* Maximum of two sizes, with overflow check.  */
 static inline size_t
 #if __GNUC__ >= 3
-__attribute__ ((__pure__))
+__attribute__((__pure__))
 #endif
-xmax (size_t size1, size_t size2)
-{
+xmax(size_t size1, size_t size2) {
   /* No explicit check is needed here, because for any n:
      max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX.  */
   return (size1 >= size2 ? size1 : size2);

LiVES-2.4.2.tar.bz2/liblives.doxygen -> LiVES-2.4.3.tar.bz2/liblives.doxygen Changed

LiVES-2.4.2.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder -> LiVES-2.4.3.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder Changed

LiVES-2.4.2.tar.bz2/lives-plugins/plugins/encoders/multi_encoder -> LiVES-2.4.3.tar.bz2/lives-plugins/plugins/encoders/multi_encoder Changed

LiVES-2.4.2.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 -> LiVES-2.4.3.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 Changed

@@ -33,12 +33,12 @@
 
 
 
-Copyright (C) 2008 - 2010 Salsaman (salsaman@xs4all.nl,salsaman@gmail.com)
+Copyright (C) 2008 - 2015 Salsaman (salsaman@gmail.com)
 
 """
 
 
-version = '0.2.14'
+version = '0.2.15'
 mpeg = 'lives_mpeg_encoder3'
 ogm = 'lives_ogm_encoder3'
 mkv = 'lives_mkv_encoder3'
@@ -50,8 +50,8 @@
 
 usage = \
       """
-multi_encoder -h
-multi_encoder [directive [args]]
+multi_encoder3 -h
+multi_encoder3 [directive [args]]
       """
 
 help = \
@@ -111,7 +111,7 @@
             clear
 
             See the LiVES documentation for details:
-            http://www.xs4all.nl/~salsaman/lives/docs.html
+     http://lives-video.com/index.php?do=documentation
      """ % version
 
 # This is the directory where all temp files will be stored.
@@ -251,10 +251,10 @@
     tempdir = os.path.abspath(TEMPDIR)
 
     try:
-        if sys.version_info[0:3] < (2, 3, 0):
+        if sys.version_info[0:3] < (3, 0, 0):
             raise SystemExit
     except:
-        print('You need Python 2.3.0 or greater to run me!', file=sys.stderr)
+        print('You need Python 3.0.0 or greater to run me!', file=sys.stderr)
         raise SystemExit
 
     try:
@@ -276,7 +276,6 @@
 
     if '-V' in opts:
         print('multi_encoder version ' + version)
-        print('multi_encoder version ' + version)
         raise SystemExit
 
     if '-v' in opts:

LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c -> LiVES-2.4.3.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c Changed

LiVES-2.4.2.tar.bz2/po/ar.po -> LiVES-2.4.3.tar.bz2/po/ar.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "أيّ"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "بدون"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "مستحسن"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "معطّل !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "مُضمَّن"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "مخصص"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "اختبار"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_خلفية بيضاء"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/ca.po -> LiVES-2.4.3.tar.bz2/po/ca.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "reconfigureu totes les finestres"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "qualsevol"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "Recomanat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "Espatllat"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Incorporat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personalitzat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Comprova"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Inici"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/cs.po -> LiVES-2.4.3.tar.bz2/po/cs.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: LiVEScz\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: <martin@svobodicz.com, ales@mur.at>\n"
@@ -89,80 +89,80 @@
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "Změnit velikost všech _snímků"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Libovolný"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Žádný"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "doporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "zakázáno!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Vestavěno"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Vlastní"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdné pozadí"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -174,114 +174,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/da.po -> LiVES-2.4.3.tar.bz2/po/da.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -76,80 +76,80 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Enhver"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "anbefalet"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Indbygget"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Brugerdefineret"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Start farve"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -161,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1832
+#: src/main.c:1838
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1833
+#: src/main.c:1839
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+msgid "cdda2wav/icedax...detected..."
 msgstr ""
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1845
+#: src/main.c:1851

LiVES-2.4.2.tar.bz2/po/de_DE.po -> LiVES-2.4.3.tar.bz2/po/de_DE.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Lives 0.9.5\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-05 16:14+0000\n"
 "Last-Translator: Michael Kohl <rolf.michael.kohl@googlemail.com>\n"
 "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n"
@@ -88,79 +88,79 @@
 msgid "Preserving set.\n"
 msgstr "Set wird erhalten.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "Alle Frames _skalieren"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Beliebig"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "empfohlen"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "deaktiviert!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Momentanes Layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Eingebaut"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeit-Effekt Plugins..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Jack Audio Server wird gestartet..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Jack Transport Server wird gestartet..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Verbindung zum Jack Transport Server wird hergestellt..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,116 @@
 "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu "
 "starten, oder "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "PulseAudio Server wird gestartet..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Optionale Abhängigkeiten werden überprüft:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...gefunden..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NICHT GEFUNDEN..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...gefunden..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NICHT GEFUNDEN..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...gefunden..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NICHT GEFUNDEN..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...gefunden..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NICHT GEFUNDEN..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...gefunden\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NICHT GEFUNDEN\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...gefunden..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NICHT GEFUNDEN..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...gefunden..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NICHT GEFUNDEN..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...gefunden..."

LiVES-2.4.2.tar.bz2/po/en_GB.po -> LiVES-2.4.3.tar.bz2/po/en_GB.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-16 10:52+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -95,79 +95,79 @@
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Resize All Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Any"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "None"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recommended"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "disabled !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Custom"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Foreground"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Background"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Starting jack transport server..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Connecting to jack transport server..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -186,114 +186,116 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/es.po -> LiVES-2.4.3.tar.bz2/po/es.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2014-01-01 22:33+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -95,79 +95,79 @@
 msgid "Preserving set.\n"
 msgstr "Preservando el conjunto.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos los cuadros"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Cualquiera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "desactivado"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Integrado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Prueba"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Frente"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Fondo"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -179,114 +179,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NO DETECTADO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NO DETECTADO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NO DETECTADO\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav... detectado..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NO DETECTADO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."

LiVES-2.4.2.tar.bz2/po/et.po -> LiVES-2.4.3.tar.bz2/po/et.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_kõikide kaadrite suuruse muutmine"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Kõik"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Pole"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "soovitatav"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "keelatud !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Sisseehitatud"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Kohandatud"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Testi"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Alusta"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
-msgstr ""
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
+msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
-msgstr ""
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
+msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844

LiVES-2.4.2.tar.bz2/po/fi.po -> LiVES-2.4.3.tar.bz2/po/fi.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -96,80 +96,80 @@
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "Muuta kaikkien kuvien k_okoa"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Mikä tahansa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Ei mitään"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "suositeltu"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "kytketty pois päältä!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Mukauta"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Kokeile"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "P_imennä tausta"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...EI HAVAITTU..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/fr.po -> LiVES-2.4.3.tar.bz2/po/fr.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-13 18:06+0000\n"
 "Last-Translator: Jean Marc <Unknown>\n"
 "Language-Team: Français <kwizart@gmail.com>\n"
@@ -94,79 +94,79 @@
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Recadre Toutes Les Images"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Tous"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recommandé"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "désactivé !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Intégré"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Essai"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Premier plan"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Arrière plan"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des greffons d'effets en temps réel…"
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Démarrage du serveur de transport jack..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport jack..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -178,114 +178,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Vérification des dépendances optionnelles :"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer... détecté..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NON DÉTECTÉ..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer... détecté..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... NON DÉTECTÉ..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert... détecté..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NON DÉTECTÉ..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite... détecté..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NON DÉTECTÉ..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox... détecté\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NON DÉTECTÉ\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav... détecté..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav... NON DÉTECTÉ..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd... détecté..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NON DÉTECTÉ..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio... détecté..."

LiVES-2.4.2.tar.bz2/po/gl.po -> LiVES-2.4.3.tar.bz2/po/gl.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-20 18:32+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -90,79 +90,79 @@
 msgid "Preserving set.\n"
 msgstr "Preservar o conxunto.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos os fotogramas"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Calquera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Ningún"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "desactivado !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Incorporado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Proba"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Primeiro plano"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Fondo"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tempo real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Iniciando o servidor de son jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor de transporte jack..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Conectando co servidor de transporte jack..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -174,114 +174,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Comprobando as dependencias opcionais:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTADO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NON DETECTADO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DETECTADO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DETECTADO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DETECTADO\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NON DETECTADO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DETECTADO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."

LiVES-2.4.2.tar.bz2/po/he.po -> LiVES-2.4.3.tar.bz2/po/he.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -95,80 +95,80 @@
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "הכל"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "ללא"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "מומלץ"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "נוטרל !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "מובנה"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "מותאם אישית"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "רקע _שחור"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -180,114 +180,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/hr.po -> LiVES-2.4.3.tar.bz2/po/hr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Bilo koji"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nijedan"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "preporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "isključeno !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Zanemari promjene"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/hu.po -> LiVES-2.4.3.tar.bz2/po/hu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2012-08-08 08:49+0000\n"
 "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n"
 "Language-Team: Magyar <lisovszki@gmail.com>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Minden képkocka átméretezése"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Bármely"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nincs"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "ajánlott"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "tíltva!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Beépített"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Egyéni"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Teszt"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Üres háttér"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/it.po -> LiVES-2.4.3.tar.bz2/po/it.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Ridimensiona tutti i fotogrammi"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Qualsiasi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "consigliato"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "disabilitato !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Integrato"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "Sfondo _Vuoto"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/ja.po -> LiVES-2.4.3.tar.bz2/po/ja.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "推奨"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "使用不能！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "ビルトイン"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "カスタム"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "テスト"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "空白のバックグラウンド(_B)"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convertが見つかりました..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "compositeが見つかりました..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "soxが見つかりました\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "soxは見つかりませんでした\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wavが見つかりました..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wavは見つかりませんでした..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackdが見つかりました..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackdは見つかりませんでした..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/lives.pot -> LiVES-2.4.3.tar.bz2/po/lives.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 2.4.2\n"
+"Project-Id-Version: lives 2.4.3\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,79 +75,79 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr ""
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -159,112 +159,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1832
+#: src/main.c:1838
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1833
+#: src/main.c:1839
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+msgid "cdda2wav/icedax...detected..."
 msgstr ""
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr ""

LiVES-2.4.2.tar.bz2/po/nl_NL.po -> LiVES-2.4.3.tar.bz2/po/nl_NL.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES 0.9.5cvs\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: \n"
@@ -73,80 +73,80 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "Vervagen"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -158,112 +158,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1832
+#: src/main.c:1838
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1833
+#: src/main.c:1839
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+msgid "cdda2wav/icedax...detected..."
 msgstr ""
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1845
+#: src/main.c:1851

LiVES-2.4.2.tar.bz2/po/oc.po -> LiVES-2.4.3.tar.bz2/po/oc.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
@@ -78,80 +78,80 @@
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Requadratge"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Requadra Totes Los Imatges"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Quin que siá"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Pas cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "desactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Integrat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personalizat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Testar"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Aviar"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -163,114 +163,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/pl.po -> LiVES-2.4.3.tar.bz2/po/pl.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -90,80 +90,80 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Skaluj Wszystkie Klatki"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Dowolny"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "zalecane"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Wbudowane"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Własne"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Przetestuj"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Uruchom"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/pms.po -> LiVES-2.4.3.tar.bz2/po/pms.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-11-09 23:22+0000\n"
 "Last-Translator: Simon Uslengh <simoneislanda@libero.it>\n"
 "Language-Team: Piemontese <pms@li.org>\n"
@@ -90,79 +90,79 @@
 msgid "Preserving set.\n"
 msgstr "Preservassion j'anpostassion\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Ardimensionament"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Ardimension-a tute le curnis"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "qualsëssìa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Gnun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "consejà"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "dësativà"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**L'atual formà**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Antregà"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Personaj"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Prim pian"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Drefond"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Caria dle gionte për j'efet an temp-real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Andi dël jack audio server..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Andi dël jack transport server..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Conession al jack transport server..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,116 @@
 "\n"
 "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Andi dël pulse audio server..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Contròl dependense opsionaj:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...trovà..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEN TROVÀ"
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...trovà..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NEN TROVÀ"
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...trovà..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEN TROVÀ..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...TROVÀ..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEN TROVÀ..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...TROVÀ\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEN TROVÀ\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...TROVÀ..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NEN TROVÀ..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...TROVÀ..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEN TROVÀ..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...TROVÀ..."

LiVES-2.4.2.tar.bz2/po/pt.po -> LiVES-2.4.3.tar.bz2/po/pt.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -84,80 +84,80 @@
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "desactivado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -169,114 +169,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/pt_BR.po -> LiVES-2.4.3.tar.bz2/po/pt_BR.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -87,80 +87,80 @@
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "desativado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -172,114 +172,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/ro.po -> LiVES-2.4.3.tar.bz2/po/ro.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -91,80 +91,80 @@
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Redimensionarea tuturor cadrelor"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Orice"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Nimic"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "dezactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Ignoră schimbările"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +176,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/ru.po -> LiVES-2.4.3.tar.bz2/po/ru.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-06 05:53+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -95,79 +95,79 @@
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Любой"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "рекомендуемые"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "отключено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Встроенный"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Настраиваемый"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Тест"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Передний план"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Фон"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -188,114 +188,116 @@
 "Также, вы можете попробовать запустить программу таким образом \"lives -"
 "jackopts 16\" или "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...обнаружен..."

LiVES-2.4.2.tar.bz2/po/sk.po -> LiVES-2.4.3.tar.bz2/po/sk.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -95,80 +95,80 @@
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Zmena veľkosti"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Zmeniť veľkosť všetkých snímkov"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Žiaden"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "doporučené"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "zakázané !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Vstavané"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Vlastné"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Otestovať"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdne pozadie"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -180,114 +180,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NENÁJDENÝ..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/te.po -> LiVES-2.4.3.tar.bz2/po/te.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
@@ -77,80 +77,80 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "పరిమాణం మార్చుట"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "ఏదైనా"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "ఏదీ వద్దు"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "సిఫారసుచేయబడింది"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "నిర్మితమైన"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "మలచిన"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "పరిశీలన"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_ప్రారంభం"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -162,112 +162,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1832
+#: src/main.c:1838
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1833
+#: src/main.c:1839
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+msgid "cdda2wav/icedax...detected..."
 msgstr ""
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1845
+#: src/main.c:1851

LiVES-2.4.2.tar.bz2/po/tr.po -> LiVES-2.4.3.tar.bz2/po/tr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -91,80 +91,80 @@
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "Tüm çerçeveleri yeniden boyutlandır"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Herhangi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Boş"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "tavsiye"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "Engelli!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Yapısal"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Özel"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Sınama"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "_Boş arkaplan"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +176,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/ug.po -> LiVES-2.4.3.tar.bz2/po/ug.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
@@ -76,80 +76,80 @@
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "خالىغان"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "يوق"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "تەۋسىيە قىلغان"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "چەكلەنگەن!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "ئىچكى"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "ئىختىيارى"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "سىناق"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "باشلا(_S)"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -161,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1832
+#: src/main.c:1838
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1833
+#: src/main.c:1839
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+msgid "cdda2wav/icedax...detected..."
 msgstr ""
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1845
+#: src/main.c:1851

LiVES-2.4.2.tar.bz2/po/uk.po -> LiVES-2.4.3.tar.bz2/po/uk.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-12-13 17:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -96,79 +96,79 @@
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Будь-який"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Жодного"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "найліпший"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "вимкнено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "Вбудований"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Нетиповий"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Перевірити"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr "Передній план"
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr "Тло"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -187,114 +187,116 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd…виявлено…"
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio…виявлено…"

LiVES-2.4.2.tar.bz2/po/uz.po -> LiVES-2.4.3.tar.bz2/po/uz.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
@@ -96,80 +96,80 @@
 msgid "Preserving set.\n"
 msgstr "Йиғилганларни сақлаш\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "Ҳажми ўзгартирилмоқда"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "Барча кадрларнинг _ҳажмини ўзгартириш"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "Исталган"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "Йўқ"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "тавсия қилинди"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "ўчирилди !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**Жорий қатлам**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "Бошқа"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "Синаш"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 #, fuzzy
 msgid "Background"
 msgstr "Сўниш"
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,116 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "конвертлаш...аниқланди..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "конвертлаш...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...аниқланди..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...аниқланди\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...АНИҚЛАНМАДИ\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...аниқланди..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...аниқланди..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."

LiVES-2.4.2.tar.bz2/po/zh_CN.po -> LiVES-2.4.3.tar.bz2/po/zh_CN.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-09-12 19:29-0300\n"
+"POT-Creation-Date: 2015-11-15 09:43-0300\n"
 "PO-Revision-Date: 2015-04-05 16:35+0000\n"
 "Last-Translator: Timothy Gu <timothy_gu@hotmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -88,79 +88,79 @@
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:695
+#: src/main.c:701
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:702
+#: src/main.c:708
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:952
+#: src/main.c:958
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:954
+#: src/main.c:960
 msgid "None"
 msgstr "无"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:956
+#: src/main.c:962
 msgid "recommended"
 msgstr "推荐"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:958
+#: src/main.c:964
 msgid "disabled !"
 msgstr "已禁用 ！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:960
+#: src/main.c:966
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:962
+#: src/main.c:968
 msgid "Builtin"
 msgstr "内置"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:964
+#: src/main.c:970
 msgid "Custom"
 msgstr "自定义"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:966
+#: src/main.c:972
 msgid "Test"
 msgstr "测试"
 
-#: src/main.c:1111
+#: src/main.c:1117
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1112
+#: src/main.c:1118
 msgid "Background"
 msgstr ""
 
-#: src/main.c:1628
+#: src/main.c:1634
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1694
+#: src/main.c:1700
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1696
+#: src/main.c:1702
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1697
+#: src/main.c:1703
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1727
+#: src/main.c:1733
 #, c-format
 msgid ""
 "\n"
@@ -179,114 +179,116 @@
 "\n"
 "除此之外，尝试用启动命令行“lives -jackopts 16\"或 "
 
-#: src/main.c:1762
+#: src/main.c:1768
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1829
+#: src/main.c:1835
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1830
+#: src/main.c:1836
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1831
+#: src/main.c:1837
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1832
+#: src/main.c:1838
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1833
+#: src/main.c:1839
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1834
+#: src/main.c:1840
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1835
+#: src/main.c:1841
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1836
+#: src/main.c:1842
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1837
+#: src/main.c:1843
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1838
+#: src/main.c:1844
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1839
+#: src/main.c:1845
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1840
-msgid "cdda2wav...detected..."
+#: src/main.c:1846
+#, fuzzy
+msgid "cdda2wav/icedax...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1841
-msgid "cdda2wav...NOT DETECTED..."
+#: src/main.c:1847
+#, fuzzy
+msgid "cdda2wav/icedax...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1842
+#: src/main.c:1848
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1843
+#: src/main.c:1849
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...未发现..."
 
-#: src/main.c:1844
+#: src/main.c:1850
 msgid "pulse audio...detected..."
 msgstr "pulse audio...发现..."

LiVES-2.4.2.tar.bz2/smogrify -> LiVES-2.4.3.tar.bz2/smogrify Changed

@@ -23,7 +23,7 @@
 # Do not change these except for testing !
 
 $background=1;
-$version="2.4.2";
+$version="2.4.3";
 #$dyneversion="LIVES-20091209";
 
 ###################################################################
@@ -402,7 +402,8 @@
             &rc_set_if_not_set("rec_stop_gb",10);
 
             &rc_set_if_not_set("def_autotrans","chroma blend");
-            &rc_set_if_not_set("audio_src",0); #internal
+            &rc_set_if_not_set("audio_src",0);
+#internal
 
             &rc_set_if_not_set("ce_thumb_mode","true");
 
@@ -1468,6 +1469,11 @@
 
             smog_chdir("$curtmpdir");
 
+            if (! -f "$file" && ! -d "$file") {
+                &sig_error("$file","could not be found","$GUI_NAME was unable to open it.","Please check the file name and try again.");
+            }
+
+
 # let get_file_info set this
 #$mplay_command=&rc_get("video_open_command");
 
@@ -1921,11 +1927,24 @@
             }
             $aendian=&get_endian;
         }
-        if ($ssigned==1) {
-            $asigned="-s";
+
+        $sox_version=&get_sox_version;
+
+        if ($sox_version < 14004001) {
+            if ($ssigned==1) {
+                $asigned="-s";
+            }
+            else {
+                $asigned="-u";
+            }
         }
         else {
-            $asigned="-u";
+            if ($ssigned==1) {
+                $asigned="-e signed-integer";
+            }
+            else {
+                $asigned="-e unsigned-integer";
+            }
         }
 
         if (defined($ARGV[11])) {
@@ -3036,10 +3055,21 @@
         unless(&is_writeable($nfile)) {
             &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
         }
-        if ($asigned==1) {
-            $asigned="-s";
+
+        $sox_version=&get_sox_version;
+
+        if ($sox_version < 14004001) {
+            if ($asigned==1) {
+                $asigned="-s";
+            } else {
+                $asigned="-u";
+            }
         } else {
-            $asigned="-u";
+            if ($asigned==1) {
+                $asigned="-e signed-integer";
+            } else {
+                $asigned="-e unsigned-integer";
+            }
         }
 
         if ($audio_end>0.) {
@@ -3594,7 +3624,10 @@
 
         $cdda2wav_command=&location("cdda2wav");
         if ($cdda2wav_command eq "") {
-            &sig_error("cdda2wav is required for this function.","Please install it first.");
+            $cdda2wav_command=&location("icedax");
+            if ($cdda2wav_command eq "") {
+                &sig_error("cdda2wav or icedax is required for this function.","Please install it first.");
+            }
         }
 
         $cdplay_device=&rc_get("cdplay_device");
@@ -3732,6 +3765,10 @@
                 unlink "$pidfile";
                 exit 1;
             }
+            if ($allow_missing) {
+                &sig_progress($new_frames);
+                sleep(1);
+            }
         }
 
         if ($with_audio) {
@@ -5393,6 +5430,7 @@
     my ($aasamps)=$asamps/8;
     my $smcom;
 
+
     smog_chdir("$curtmpdir");
     if (&location("sox") eq "") {
         $format=&get_mplayer_format;
@@ -5415,6 +5453,26 @@
         else {
             $nodither="-D";
             $sasamps=$aasamps;
+
+            if ($sox_version >= 14004001) {
+                if ($aasamps == 1) {
+                    $sasamps = "b 8";
+                }
+                elsif ($aasamps == 2) {
+                    $sasamps = "b 16";
+                }
+                elsif ($aasamps == 3) {
+                    $sasamps = "b 24";
+                }
+                elsif ($aasamps == 4) {
+                    $sasamps = "b 32";
+                }
+                elsif ($aasamps == 8) {
+                    $sasamps = "b 64";
+                }
+
+            }
+
         }
 
         if (!defined($nrate)) {
@@ -5426,12 +5484,13 @@
         }
 
         if (!defined($nasamps)) {
-            $nasamps=$sasamps;
+            $nasamps=$asamps;
         }
 
+
         if (!defined($asigned)) {
             if ($sox_version < 14004001) {
-                if ($sasamps==8) {
+                if ($asamps==8) {
                     $asigned="-u";
                 }
                 else {
@@ -5439,7 +5498,7 @@
                 }
             }
             else {
-                if ($sasamps==8) {
+                if ($aasamps==8) {
                     $asigned="-e unsigned-integer";
                 }
                 else {
@@ -5448,6 +5507,7 @@
             }
         }
 
+
         if (!defined($nsigned)) {
             if ($nasamps==8) {
                 if ($sox_version < 14004001) {
@@ -5462,7 +5522,29 @@
             }
         }
 
-        $smcom="sox $nodither -t .raw -r $arate $asigned -$sasamps -c $achans \"$audio_in\" -t .wav -r $nrate -c $nchans $nsigned -$nasamps \"$curtmpdir/audiodump.wav\" >$nulfile 2>&1";
+        $nnasamps = $nasamps/8;
+
+        if ($sox_version >= 14004001) {
+            if ($nnasamps == 1) {
+                $nnasamps = "b 8";
+            }
+            elsif ($nnasamps == 2) {
+                $nnasamps = "b 16";
+            }
+            elsif ($nnasamps == 3) {
+                $nnasamps = "b 24";
+            }
+            elsif ($nnasamps == 4) {
+                $nnasamps = "b 32";
+            }
+            elsif ($nnasamps == 8) {
+                $nnasamps = "b 64";
+            }
+
+        }

LiVES-2.4.2.tar.bz2/src/Makefile.in -> LiVES-2.4.3.tar.bz2/src/Makefile.in Changed

LiVES-2.4.2.tar.bz2/src/audio.c -> LiVES-2.4.3.tar.bz2/src/audio.c Changed

LiVES-2.4.2.tar.bz2/src/callbacks.c -> LiVES-2.4.3.tar.bz2/src/callbacks.c Changed

@@ -2482,6 +2482,7 @@
   end=cfile->end;
 
   if (cfile->clip_type==CLIP_TYPE_FILE) {
+    // for virtual frames, we copy only the frame_index
     clipboard->clip_type=CLIP_TYPE_FILE;
     clipboard->interlace=cfile->interlace;
     clipboard->deinterlace=cfile->deinterlace;
@@ -2490,7 +2491,7 @@
     check_if_non_virtual(0,1,clipboard->frames);
     if (clipboard->clip_type==CLIP_TYPE_FILE) {
       clipboard->ext_src=clone_decoder(mainw->current_file);
-      end=-end;
+      end=-end; // allow missing frames
     }
   }
 
@@ -2499,6 +2500,7 @@
 
   clipboard->img_type=cfile->img_type;
 
+  // copy audio and frames
   com=lives_strdup_printf("%s insert \"%s\" \"%s\" 0 %d %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",prefs->backend,
                           clipboard->handle, get_image_ext_for_type(clipboard->img_type),
                           start, end, cfile->handle, mainw->ccpd_with_sound, cfile->fps, cfile->arate,
@@ -3059,9 +3061,9 @@
     mainw->cancelled=CANCEL_NONE;
     mainw->current_file=0;
     cfile->progress_start=1;
-    cfile->progress_end=count_virtual_frames(cfile->frame_index,start,end);
+    cfile->progress_end=count_virtual_frames(cfile->frame_index,1,cb_end);
     do_threaded_dialog(_("Pulling frames from clipboard"),TRUE);
-    retb=virtual_to_images(mainw->current_file,start,end,TRUE,NULL);
+    retb=virtual_to_images(mainw->current_file,1,cb_end,TRUE,NULL);
     end_threaded_dialog();
     mainw->current_file=current_file;
 
@@ -3731,25 +3733,19 @@
 }
 
 
-void
-on_select_start_only_activate(LiVESMenuItem     *menuitem,
-                              livespointer         user_data) {
+void on_select_start_only_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->current_file==-1) return;
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->start);
 }
 
-void
-on_select_end_only_activate(LiVESMenuItem     *menuitem,
-                            livespointer         user_data) {
+void on_select_end_only_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->current_file==-1) return;
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->end);
 }
 
 
 
-void
-on_select_invert_activate(LiVESMenuItem     *menuitem,
-                          livespointer         user_data) {
+void on_select_invert_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (cfile->start==1) {
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->end+1);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames);
@@ -3764,9 +3760,8 @@
   load_end_image(cfile->end);
 }
 
-void
-on_select_last_activate(LiVESMenuItem     *menuitem,
-                        livespointer         user_data) {
+
+void on_select_last_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (cfile->undo_start > cfile->frames) cfile->undo_start=cfile->frames;
   if (cfile->undo_end > cfile->frames) cfile->undo_end=cfile->frames;
 
@@ -3783,9 +3778,7 @@
 }
 
 
-void
-on_select_new_activate(LiVESMenuItem     *menuitem,
-                       livespointer         user_data) {
+void on_select_new_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (cfile->insert_start > cfile->frames) cfile->insert_start=cfile->frames;
   if (cfile->insert_end > cfile->frames) cfile->insert_end=cfile->frames;
 
@@ -3801,27 +3794,24 @@
   load_end_image(cfile->end);
 }
 
-void
-on_select_to_end_activate(LiVESMenuItem     *menuitem,
-                          livespointer         user_data) {
+
+void on_select_to_end_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames);
   cfile->end=cfile->frames;
   get_play_times();
   load_end_image(cfile->end);
 }
 
-void
-on_select_from_start_activate(LiVESMenuItem     *menuitem,
-                              livespointer         user_data) {
+
+void on_select_from_start_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1);
   cfile->start=cfile->frames>0?1:0;
   get_play_times();
   load_start_image(cfile->start);
 }
 
-void
-on_lock_selwidth_activate(LiVESMenuItem     *menuitem,
-                          livespointer         user_data) {
+
+void on_lock_selwidth_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   mainw->selwidth_locked=!mainw->selwidth_locked;
   lives_widget_set_sensitive(mainw->select_submenu,!mainw->selwidth_locked);
 }
@@ -5637,9 +5627,7 @@
 
 
 
-void
-on_about_activate(LiVESMenuItem     *menuitem,
-                  livespointer         user_data) {
+void on_about_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,14,0)
@@ -5705,46 +5693,34 @@
 
 
 
-void
-show_manual_activate(LiVESMenuItem     *menuitem,
-                     livespointer         user_data) {
+void show_manual_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   show_manual_section(NULL,NULL);
 }
 
 
 
-void
-email_author_activate(LiVESMenuItem     *menuitem,
-                      livespointer         user_data) {
+void email_author_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   activate_url_inner(LIVES_AUTHOR_EMAIL);
 }
 
 
-void
-report_bug_activate(LiVESMenuItem     *menuitem,
-                    livespointer         user_data) {
+void report_bug_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   activate_url_inner(LIVES_BUG_URL);
 }
 
 
-void
-suggest_feature_activate(LiVESMenuItem     *menuitem,
-                         livespointer         user_data) {
+void suggest_feature_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   activate_url_inner(LIVES_FEATURE_URL);
 }
 
 
-void
-help_translate_activate(LiVESMenuItem     *menuitem,
-                        livespointer         user_data) {
+void help_translate_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   activate_url_inner(LIVES_TRANSLATE_URL);
 }
 
 
 
-void
-donate_activate(LiVESMenuItem     *menuitem,
-                livespointer         user_data) {
+void donate_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   const char *link=lives_strdup_printf("%s%s",LIVES_DONATE_URL,user_data==NULL?"":(char *)user_data);
   activate_url_inner(link);
 }
@@ -6708,8 +6684,7 @@
 }
 
 
-void on_full_screen_pressed(LiVESButton *button,
-                            livespointer user_data) {
+void on_full_screen_pressed(LiVESButton *button, livespointer user_data) {
   // toolbar button (full screen)
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->full_screen),!mainw->fs);
 }
@@ -6917,17 +6892,14 @@
 }

LiVES-2.4.2.tar.bz2/src/dialogs.c -> LiVES-2.4.3.tar.bz2/src/dialogs.c Changed

LiVES-2.4.2.tar.bz2/src/effects-weed.c -> LiVES-2.4.3.tar.bz2/src/effects-weed.c Changed

@@ -1706,7 +1706,7 @@
   int num_in_tracks,num_out_tracks;
   int error;
   int frame;
-  int inwidth,inheight,inpalette,outpalette,channel_flags,filter_flags=0;
+  int inwidth,inheight,inpalette,outpalette,opalette,channel_flags,filter_flags=0;
   int palette,cpalette;
   int outwidth,outheight;
   int incwidth,incheight,numplanes=0,width,height;
@@ -1834,17 +1834,21 @@
 
   if (num_in_tracks>num_inc) num_in_tracks=num_inc; // for example, compound fx
 
+
+  // if we have more in_channels in the effect than in_tracks, we MUST (temp) disable the extra in_channels
   if (num_inc>num_in_tracks) {
     for (i=num_in_tracks; i<num_inc+num_in_alpha; i++) {
       if (!weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))) {
         if (!weed_plant_has_leaf(in_channels[i],"disabled")||
             weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE)
           weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
-        else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
+        else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE); // "disabled" will do instead
       }
     }
   }
 
+
+  // count the actual layers fed in
   while (layers[lcount++]!=NULL);
 
   for (k=i=0; i<num_in_tracks; i++) {
@@ -1863,13 +1867,18 @@
     weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE);
 
     if (in_tracks[i]>=lcount) {
+      // here we have more in_tracks than actual layers (this can happen if we have blank frames)
+      // disable some optional channels if we can
       for (j=k; j<num_in_tracks+num_in_alpha; j++) {
         if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) continue;
         channel=in_channels[j];
         chantmpl=weed_get_plantptr_value(channel,"template",&error);
-        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"optional")&&
             weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
-          weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+          if (!weed_plant_has_leaf(channel,"disabled")||
+              weed_get_boolean_value(channel,"disabled",&error)==WEED_FALSE)
+            weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+          else weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE); // "disabled" will do instead
         else {
           lives_free(in_tracks);
           lives_free(out_tracks);
@@ -1882,17 +1891,22 @@
     }
     layer=layers[in_tracks[i]];
 
+    // wait for thread to pull layer pixel_data
     check_layer_ready(layer);
 
     if (weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) {
+      // we got no pixel_data for some reason
       frame=weed_get_int_value(layer,"frame",&error);
       if (frame==0) {
         // temp disable channels if we can
         channel=in_channels[k];
         chantmpl=weed_get_plantptr_value(channel,"template",&error);
-        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"optional")&&
             weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE)) {
-          weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+          if (!weed_plant_has_leaf(channel,"disabled")||
+              weed_get_boolean_value(channel,"disabled",&error)==WEED_FALSE)
+            weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+          else weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE); // "disabled" will do instead
         } else {
           lives_free(in_tracks);
           lives_free(out_tracks);
@@ -1908,6 +1922,7 @@
 
   // ensure all chantmpls not marked "optional" have at least one corresponding enabled channel
   // e.g. we could have disabled all channels from a template with "max_repeats" that is not "optional"
+
   num_ctmpl=weed_leaf_num_elements(filter,"in_channel_templates");
   mand=(int *)lives_malloc(num_ctmpl*sizint);
   for (j=0; j<num_ctmpl; j++) mand[j]=0;
@@ -1944,6 +1959,8 @@
   lives_free(mand);
 
 
+  // that is it for in_channels, now we go on to out_channels
+
   num_outc=weed_leaf_num_elements(inst,"out_channels");
 
   for (i=0; i<num_outc; i++) {
@@ -1973,7 +1990,6 @@
     return FILTER_ERROR_MISSING_CHANNEL;
   }
 
-
   // pull frames for tracks
 
   for (i=0; i<num_out_tracks+num_out_alpha; i++) {
@@ -1981,8 +1997,10 @@
     channel=out_channels[i];
     palette=weed_get_int_value(channel,"current_palette",&error);
     if (weed_palette_is_alpha_palette(palette)) continue;
-    if (weed_plant_has_leaf(channel,"host_temp_disabled")&&
-        weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
+    if ((weed_plant_has_leaf(channel,"disabled")&&
+         weed_get_boolean_value(channel,"disabled",&error)==WEED_TRUE)||
+        (weed_plant_has_leaf(channel,"host_temp_disabled")&&
+         weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE)) continue;
     all_outs_alpha=FALSE;
   }
 
@@ -1990,14 +2008,18 @@
   for (j=i=0; i<num_in_tracks; i++) {
     while (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) j++;
 
-    if (weed_plant_has_leaf(in_channels[j],"host_temp_disabled")&&
-        weed_get_boolean_value(in_channels[j],"host_temp_disabled",&error)==WEED_TRUE) {
+    if ((weed_plant_has_leaf(in_channels[j],"disabled")&&
+         weed_get_boolean_value(in_channels[j],"disabled",&error)==WEED_TRUE)||
+        (weed_plant_has_leaf(in_channels[j],"host_temp_disabled")&&
+         weed_get_boolean_value(in_channels[j],"host_temp_disabled",&error)==WEED_TRUE)) {
       j++;
       continue;
     }
     layer=layers[in_tracks[i]];
     clip=weed_get_int_value(layer,"clip",&error);
 
+    // check_layer_ready() should have done this, but lets check again
+
     if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) {
       // pull_frame will set pixel_data,width,height,current_palette and rowstrides
       if (!pull_frame(layer,get_image_ext_for_type(mainw->files[clip]->img_type),tc)) {
@@ -2138,19 +2160,32 @@
 
     // try to match palettes with first enabled in channel:
     // TODO ** - we should see which palette causes the least palette conversions
+
+
+    // TODO: logic here was changed 22/09/2015. Check it is OK
+    inpalette=weed_get_int_value(layer,"current_palette",&error);
+
     if (i>0&&!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY))
-      palette=weed_get_int_value(def_channel,"current_palette",&error);
+      inpalette=weed_get_int_value(def_channel,"current_palette",&error);
+
+    opalette=weed_get_int_value(channel,"current_palette",&error);
 
-    if (palette!=inpalette) {
+    if (opalette!=inpalette) {
       // palette change needed; first try to change channel palette
       int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
       int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
-      if ((palette=check_weed_palette_list(palettes,num_palettes,palette))!=inpalette) {
+      if ((palette=check_weed_palette_list(palettes,num_palettes,inpalette))!=opalette) {
+        // palette is the nearest match to inpalette
+
         weed_set_int_value(channel,"current_palette",palette);
         if (channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE) needs_reinit=TRUE;
+
         weed_set_int_value(channel,"width",incwidth/
                            weed_palette_get_pixels_per_macropixel(palette)*
-                           weed_palette_get_pixels_per_macropixel(inpalette));
+                           weed_palette_get_pixels_per_macropixel(opalette));
+
+
+
         nchr=weed_leaf_num_elements(channel,"rowstrides");
         channel_rows=weed_get_int_array(channel,"rowstrides",&error);
         for (j=0; j<nchr; j++) {
@@ -2175,6 +2210,8 @@
     }
   }
 
+
+
   // we stored original key/mode to use here
   if (weed_plant_has_leaf(inst,"host_key")) {
     // pull from alpha chain
@@ -2204,7 +2241,10 @@
       chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
       if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
           weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
-        weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+        if (!weed_plant_has_leaf(in_channels[i],"disabled")||
+            weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE)
+          weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+        else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE); // "disabled" will do instead
       else {
         lives_free(in_tracks);
         lives_free(out_tracks);
@@ -2224,6 +2264,10 @@
 
     do {
       channel=get_enabled_channel(inst,i,TRUE);
+

LiVES-2.4.2.tar.bz2/src/events.c -> LiVES-2.4.3.tar.bz2/src/events.c Changed

@@ -1,6 +1,6 @@
 // events.c
 // LiVES
-// (c) G. Finch 2005 - 2014 <salsaman@gmail.com>
+// (c) G. Finch 2005 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -540,6 +540,7 @@
     event_after=get_first_event(event_list);
     error=weed_set_voidptr_value(event_list,"first",event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    if (event_after==event) event_after=NULL;
   } else {
     event_after=get_next_event(event_before);
     error=weed_set_voidptr_value(event_before,"next",event);
@@ -548,6 +549,7 @@
 
   error=weed_set_voidptr_value(event,"previous",event_before);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+
   error=weed_set_voidptr_value(event,"next",event_after);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
 
@@ -558,6 +560,7 @@
   hint=get_event_hint(in_event);
   switch (hint) {
   case WEED_EVENT_HINT_FILTER_INIT:
+    weed_leaf_delete(event,"event_id");
     error=weed_set_voidptr_value(event,"event_id",(void *)in_event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     filter_hash=weed_get_string_value(event,"filter",&error);
@@ -583,6 +586,7 @@
     new_init_event=find_init_event_by_id(init_event,event);
     error=weed_set_voidptr_value(event,"init_event",new_init_event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    weed_leaf_delete(new_init_event,"event_id");
     error=weed_set_voidptr_value((weed_plant_t *)new_init_event,"event_id",(void *)new_init_event);  // useful later for event_list_rectify
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     break;
@@ -1289,7 +1293,7 @@
 
 
 
-void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, livespointer data) {
+weed_plant_t *insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, livespointer data) {
   // insert marker event as first event at same timecode as (FRAME_EVENT) at_event
   weed_timecode_t tc=get_event_timecode(at_event);
   weed_plant_t *event=weed_plant_new(WEED_PLANT_EVENT);
@@ -1323,12 +1327,12 @@
         lives_free(new_tracks);
         lives_free(tracks);
         weed_plant_free(event); // new event not used
-        return;
+        return event;
       }
       if (get_event_timecode(at_event)<tc) {
         // create new event
         if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
-        return;
+        return event;
       }
       break;
     }
@@ -1339,6 +1343,8 @@
   insert_event_before(at_event,event);
   weed_set_voidptr_value(event_list,"first",event);
 
+  return event;
+
 }
 
 
@@ -2263,7 +2269,7 @@
 
   while (event!=NULL) {
     if (WEED_EVENT_IS_FRAME(event)) {
-      (cfile->events[i++])->value=weed_get_int_value(event,"frames",&error);
+      (cfile->events[0]+i++)->value=weed_get_int_value(event,"frames",&error);
     }
     event=get_next_event(event);
   }
@@ -2638,21 +2644,26 @@
 
   filter=get_weed_filter(filter_idx);
 
-  // TODO *** - should use inst values here and not filter values
-
   if (weed_plant_has_leaf(filter,"in_channel_templates"))
     total_in_channels=weed_leaf_num_elements(filter,"in_channel_templates");
+
+
+
   if (total_in_channels>0) {
     int count[total_in_channels];
     ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
     for (i=0; i<total_in_channels; i++) {
+
       if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) {
         count[i]=1;
         my_in_tracks++;
         weed_set_int_value(ctmpl[i],"host_repeats",1);
       } else count[i]=0;
+
+
     }
 
+    // TODO ***
     if (my_in_tracks<num_in_tracks) {
       int repeats;
       // we need to use some repeated channels
@@ -2661,13 +2672,21 @@
           repeats=weed_get_int_value(ctmpl[i],"max_repeats",&error);
           if (repeats==0) {
             count[i]+=num_in_tracks-my_in_tracks;
-            weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
-            weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+
+            /*
+                  weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+                  weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+            */
+
             break;
           }
           count[i]+=num_in_tracks-my_in_tracks>=repeats-1?repeats-1:num_in_tracks-my_in_tracks;
-          weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
-          weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+
+          /*
+                weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+                weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+          */
+
           my_in_tracks+=count[i]-1;
           if (my_in_tracks==num_in_tracks) break;
         }
@@ -2679,6 +2698,7 @@
 
   if (weed_plant_has_leaf(filter,"out_channel_templates"))
     total_out_channels=weed_leaf_num_elements(filter,"out_channel_templates");
+
   if (total_out_channels>0) {
     int count[total_out_channels];
     ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
@@ -2686,8 +2706,9 @@
       if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) count[i]=1;
       else count[i]=0;
     }
-    weed_set_int_array(event,"out_count",total_out_channels,count);
     lives_free(ctmpl);
+
+    weed_set_int_array(event,"out_count",total_out_channels,count);
   }
 
 
@@ -2964,7 +2985,8 @@
   weed_plant_t *filter;
   weed_plant_t *inst;
 
-  weed_plant_t **ctmpl;
+  weed_plant_t **citmpl=NULL,**cotmpl=NULL;
+  weed_plant_t **bitmpl=NULL,**botmpl=NULL;
   weed_plant_t **source_params,**in_params;
 
   char *filter_name;
@@ -2975,7 +2997,7 @@
   int error;
   int num_params,offset=0;
   int num_in_count=0;
-  int num_channels;
+  int num_in_channels=0,num_out_channels=0;
   int new_file;
   int hint;
   int key,idx;
@@ -3160,36 +3182,68 @@
         in_count=weed_get_int_array(next_event,"in_count",&error);
       }
 
+
       if (weed_plant_has_leaf(filter,"in_channel_templates")) {
-        if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
-          ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-          if (num_channels!=num_in_count) LIVES_ERROR("num_in_count != num_in_channels");
-          for (i=0; i<num_channels; i++) {
+        if ((num_in_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
+          bitmpl=(weed_plant_t **)weed_malloc(num_in_channels*sizeof(weed_plant_t *));
+          citmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+          if (num_in_channels!=num_in_count) LIVES_ERROR("num_in_count != num_in_channels");
+          for (i=0; i<num_in_channels; i++) {
+            bitmpl[i]=weed_plant_copy(citmpl[i]);
             if (in_count[i]>0) {
-              weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-              weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
-            } else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
+              weed_set_boolean_value(citmpl[i],"host_disabled",WEED_FALSE);
+              weed_set_int_value(citmpl[i],"host_repeats",in_count[i]);
+            } else weed_set_boolean_value(citmpl[i],"host_disabled",WEED_TRUE);
           }
-          lives_free(ctmpl);

LiVES-2.4.2.tar.bz2/src/events.h -> LiVES-2.4.3.tar.bz2/src/events.h Changed

LiVES-2.4.2.tar.bz2/src/giw/giwvslider.c -> LiVES-2.4.3.tar.bz2/src/giw/giwvslider.c Changed

LiVES-2.4.2.tar.bz2/src/gui.c -> LiVES-2.4.3.tar.bz2/src/gui.c Changed

@@ -184,9 +184,7 @@
   LiVESWidget *rfx_submenu;
   LiVESWidget *midi_menu;
   LiVESWidget *midi_submenu;
-  LiVESWidget *midi_learn;
   LiVESWidget *midi_load;
-  LiVESWidget *midi_save;
   LiVESWidget *vj_menu;
   LiVESWidget *toys_menu;
   LiVESWidget *win;
@@ -453,49 +451,51 @@
 #endif
   }
 
-  mainw->add_live_menu = lives_menu_item_new_with_mnemonic(_("_Add Webcam/TV card..."));
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Add Webcam/TV card..."));
+  mainw->unicap = lives_menu_item_new_with_mnemonic(_("Add _Unicap Device"));
+  mainw->firewire = lives_menu_item_new_with_mnemonic(_("Add Live _Firewire Device"));
+  mainw->tvdev = lives_menu_item_new_with_mnemonic(_("Add _TV Device"));
 
 #if defined(HAVE_UNICAP) || defined(HAVE_YUV4MPEG)
-  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->add_live_menu);
-  lives_widget_show(mainw->add_live_menu);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
+  lives_widget_show(menuitem);
 
 #ifndef HAVE_UNICAP
   if (capable->has_mplayer||capable->has_mplayer2) {
 #endif
 
     submenu=lives_menu_new();
-    lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->add_live_menu), submenu);
+    lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), submenu);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
     lives_widget_show(submenu);
 
+
 #ifdef HAVE_UNICAP
-    menuitem = lives_menu_item_new_with_mnemonic(_("Add _Unicap Device"));
-    lives_container_add(LIVES_CONTAINER(submenu), menuitem);
-    lives_widget_show(menuitem);
-    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+    lives_container_add(LIVES_CONTAINER(submenu), mainw->unicap);
+    lives_widget_show(mainw->unicap);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->unicap), LIVES_WIDGET_ACTIVATE_SIGNAL,
                          LIVES_GUI_CALLBACK(on_open_vdev_activate),
                          NULL);
 #endif
 
+
 #ifdef HAVE_YUV4MPEG
     if (capable->has_dvgrab) {
-      menuitem = lives_menu_item_new_with_mnemonic(_("Add Live _Firewire Device"));
-      lives_container_add(LIVES_CONTAINER(submenu), menuitem);
-      lives_widget_show(menuitem);
+      lives_container_add(LIVES_CONTAINER(submenu), mainw->firewire);
+      lives_widget_show(mainw->firewire);
 
-      lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+      lives_signal_connect(LIVES_GUI_OBJECT(mainw->firewire), LIVES_WIDGET_ACTIVATE_SIGNAL,
                            LIVES_GUI_CALLBACK(on_live_fw_activate),
                            NULL);
     }
 
-    menuitem = lives_menu_item_new_with_mnemonic(_("Add _TV Device"));
-    lives_container_add(LIVES_CONTAINER(submenu), menuitem);
-    lives_widget_show(menuitem);
+    lives_container_add(LIVES_CONTAINER(submenu), mainw->tvdev);
+    lives_widget_show(mainw->tvdev);
 
-    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->tvdev), LIVES_WIDGET_ACTIVATE_SIGNAL,
                          LIVES_GUI_CALLBACK(on_live_tvcard_activate),
                          NULL);
 
@@ -771,11 +771,12 @@
   mainw->select_submenu = lives_menu_item_new_with_mnemonic(_("_Select..."));
   lives_widget_show(mainw->select_submenu);
   lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->select_submenu);
-  lives_widget_set_sensitive(mainw->select_submenu,FALSE);
+
 
   select_submenu_menu=lives_menu_new();
 
   lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->select_submenu), select_submenu_menu);
+  lives_widget_set_sensitive(mainw->select_submenu,FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(select_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -1192,7 +1193,7 @@
   lives_container_add(LIVES_CONTAINER(audio_menu), mainw->eject_cd);
 
   if (capable->smog_version_correct) {
-    if (!(capable->has_cdda2wav&&strlen(prefs->cdplay_device))) {
+    if (!capable->has_cdda2wav) {
       lives_widget_set_sensitive(mainw->load_cdtrack, FALSE);
       lives_widget_set_sensitive(mainw->eject_cd, FALSE);
     }
@@ -1243,10 +1244,12 @@
   mainw->export_submenu = lives_menu_item_new_with_mnemonic(_("_Export Audio..."));
   lives_widget_show(mainw->export_submenu);
   lives_container_add(LIVES_CONTAINER(audio_menu), mainw->export_submenu);
-  lives_widget_set_sensitive(mainw->export_submenu,FALSE);
 
   export_submenu_menu=lives_menu_new();
+  lives_widget_set_sensitive(export_submenu_menu,FALSE);
+
   lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->export_submenu), export_submenu_menu);
+
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(export_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(export_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -1269,10 +1272,12 @@
   mainw->trim_submenu = lives_menu_item_new_with_mnemonic(_("_Trim/Pad Audio..."));
   lives_widget_show(mainw->trim_submenu);
   lives_container_add(LIVES_CONTAINER(audio_menu), mainw->trim_submenu);
-  lives_widget_set_sensitive(mainw->trim_submenu,FALSE);
 
   trimaudio_submenu_menu=lives_menu_new();
+  lives_widget_set_sensitive(trimaudio_submenu_menu,FALSE);
+
   lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->trim_submenu), trimaudio_submenu_menu);
+
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(trimaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(trimaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -1292,10 +1297,12 @@
   mainw->delaudio_submenu = lives_menu_item_new_with_mnemonic(_("_Delete Audio..."));
   lives_widget_show(mainw->delaudio_submenu);
   lives_container_add(LIVES_CONTAINER(audio_menu), mainw->delaudio_submenu);
-  lives_widget_set_sensitive(mainw->delaudio_submenu,FALSE);
 
   delaudio_submenu_menu=lives_menu_new();
+
   lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->delaudio_submenu), delaudio_submenu_menu);
+  lives_widget_set_sensitive(mainw->delaudio_submenu,FALSE);
+
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(delaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(delaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -1482,13 +1489,13 @@
   }
 
   if (mainw->num_rendered_effects_test>0) {
-    lives_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
+    lives_widget_set_sensitive(mainw->run_test_rfx_menu,TRUE);
     lives_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
   } else {
-    lives_widget_set_sensitive(mainw->run_test_rfx_submenu,FALSE);
+    lives_widget_set_sensitive(mainw->run_test_rfx_menu,FALSE);
     lives_widget_set_sensitive(mainw->promote_test_rfx,FALSE);
     lives_widget_set_sensitive(mainw->delete_test_rfx,FALSE);
     lives_widget_set_sensitive(mainw->rename_test_rfx,FALSE);
@@ -1604,15 +1611,15 @@
   }
   lives_widget_show(midi_menu);
 
-  midi_learn = lives_menu_item_new_with_mnemonic(_("_MIDI/joystick learner..."));
+  mainw->midi_learn = lives_menu_item_new_with_mnemonic(_("_MIDI/joystick learner..."));
 
-  lives_widget_show(midi_learn);
-  lives_container_add(LIVES_CONTAINER(midi_menu), midi_learn);
+  lives_widget_show(mainw->midi_learn);
+  lives_container_add(LIVES_CONTAINER(midi_menu), mainw->midi_learn);
 
-  midi_save = lives_menu_item_new_with_mnemonic(_("_Save device mapping..."));
+  mainw->midi_save = lives_menu_item_new_with_mnemonic(_("_Save device mapping..."));
 
-  lives_widget_show(midi_save);
-  lives_container_add(LIVES_CONTAINER(midi_menu), midi_save);
+  lives_widget_show(mainw->midi_save);
+  lives_container_add(LIVES_CONTAINER(midi_menu), mainw->midi_save);
 
 
   midi_load = lives_menu_item_new_with_mnemonic(_("_Load device mapping..."));
@@ -2088,7 +2095,9 @@
   }
   lives_widget_set_vexpand(mainw->freventbox0,FALSE);
   lives_widget_set_hexpand(mainw->freventbox0,FALSE);
+
   lives_container_add(LIVES_CONTAINER(mainw->frame1), mainw->freventbox0);
+
   lives_widget_set_app_paintable(mainw->freventbox0,TRUE);
 
   lives_widget_show(mainw->start_image);
@@ -2112,6 +2121,7 @@
   lives_widget_set_size_request(mainw->playframe, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
   lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
 
+
   lives_frame_set_shadow_type(LIVES_FRAME(mainw->playframe), LIVES_SHADOW_NONE);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
@@ -2325,6 +2335,7 @@

LiVES-2.4.2.tar.bz2/src/interface.c -> LiVES-2.4.3.tar.bz2/src/interface.c Changed

@@ -365,7 +365,7 @@
   else
     title=lives_strdup(_("LiVES: - Multitrack details"));
 
-  filew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  filew->dialog = lives_standard_dialog_new(title,FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT);
   lives_free(title);
 
   accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
@@ -388,6 +388,7 @@
 
     table=lives_table_new(3,4,TRUE);
 
+
     lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4);
     lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height);
     lives_container_set_border_width(LIVES_CONTAINER(table), widget_opts.border_width);
@@ -2533,7 +2534,7 @@
 
   char *tmp,*tmp2;
 
-  dialog = lives_standard_dialog_new(_("LiVES: - Disk Recovery Options"),FALSE,-1,-1);
+  dialog = lives_standard_dialog_new(_("LiVES: - Disk Recovery Options"),FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2546,7 +2547,8 @@
   lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width*2);
 
   widget_opts.apply_theme=FALSE;
-  scrollw = lives_standard_scrolled_window_new(450.*widget_opts.scale,300.*widget_opts.scale,vbox);
+  scrollw = lives_standard_scrolled_window_new(DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT,vbox);
+  lives_widget_set_size_request(scrollw,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT);
   widget_opts.apply_theme=woat;
 
   lives_container_add(LIVES_CONTAINER(dialog_vbox), scrollw);

LiVES-2.4.2.tar.bz2/src/ldvinterface.c -> LiVES-2.4.3.tar.bz2/src/ldvinterface.c Changed

LiVES-2.4.2.tar.bz2/src/liblives.hpp -> LiVES-2.4.3.tar.bz2/src/liblives.hpp Changed

LiVES-2.4.2.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.4.3.tar.bz2/src/lives-yuv4mpeg.c Changed

@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+static boolean gotbroken;
 
 typedef struct y4data {
   const char *filename;
@@ -96,8 +97,16 @@
   fill_read(yuv4mpeg->fd,buff,5);
 
   if (strncmp(buff,"FRAME",5)) {
-    thread_data->i=Y4M_ERR_MAGIC;
-    pthread_exit(NULL);
+    if (!gotbroken) {
+      thread_data->i=Y4M_ERR_MAGIC;
+      pthread_exit(NULL);
+    }
+
+    do {
+      memmove(buff,buff+1,4);
+      fill_read(yuv4mpeg->fd,buff+4,1);
+    } while (strncmp(buff,"FRAME",5));
+
   }
 
   do {
@@ -151,6 +160,8 @@
     d_print("");
     d_print(_("Waiting for yuv4mpeg frames..."));
 
+    gotbroken=FALSE;
+
     while (!lives_alarm_get(alarm_handle)&&!pthread_kill(y4thread,0)) {
       // wait for thread to complete or timeout
       lives_usleep(prefs->sleep_time);
@@ -314,7 +325,8 @@
     // timeout - kill thread and wait for it to terminate
     pthread_cancel(y4thread);
     d_print(_("Unable to read the incoming video frame\n"));
-  }
+    gotbroken=TRUE;
+  } else gotbroken=FALSE;
 
   pthread_join(y4thread,NULL);
   lives_alarm_clear(alarm_handle);

LiVES-2.4.2.tar.bz2/src/main.c -> LiVES-2.4.3.tar.bz2/src/main.c Changed

@@ -498,6 +498,12 @@
     return FALSE;
   }
 
+#if GTK_CHECK_VERSION(3,0,0)
+  prefs->funky_widgets=TRUE;
+#else
+  prefs->funky_widgets=FALSE;
+#endif
+
   prefs->show_splash=TRUE;
 
   // from here onwards we can use get_pref() and friends  //////
@@ -1837,8 +1843,8 @@
   else d_print(_("composite...NOT DETECTED..."));
   if (capable->has_sox_sox) d_print(_("sox...detected\n"));
   else d_print(_("sox...NOT DETECTED\n"));
-  if (capable->has_cdda2wav) d_print(_("cdda2wav...detected..."));
-  else d_print(_("cdda2wav...NOT DETECTED..."));
+  if (capable->has_cdda2wav) d_print(_("cdda2wav/icedax...detected..."));
+  else d_print(_("cdda2wav/icedax...NOT DETECTED..."));
   if (capable->has_jackd) d_print(_("jackd...detected..."));
   else d_print(_("jackd...NOT DETECTED..."));
   if (capable->has_pulse_audio) d_print(_("pulse audio...detected..."));
@@ -1940,10 +1946,17 @@
   lives_color_parse("dark red", &palette->dark_red);
   lives_color_parse("light blue", &palette->light_blue);
   lives_color_parse("light yellow", &palette->light_yellow);
-  lives_color_parse("grey10", &palette->grey20);
   lives_color_parse("grey25", &palette->grey25);
   lives_color_parse("grey45", &palette->grey45);
-  lives_color_parse("grey60", &palette->grey60);
+
+  if (prefs->funky_widgets) {
+    lives_color_parse("grey5", &palette->grey20);
+    lives_color_parse("grey25", &palette->grey60);
+  } else {
+    lives_color_parse("grey10", &palette->grey20);
+    lives_color_parse("grey60", &palette->grey60);
+  }
+
   lives_color_parse("pink", &palette->pink);
   lives_color_parse("salmon", &palette->light_red);
   lives_color_parse("DarkOrange4", &palette->dark_orange);
@@ -2009,6 +2022,7 @@
           palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
         } else {
           if (!(strcmp(prefs->theme,"crayons-bright"))) {
+
             lives_widget_color_copy(&palette->normal_back,&palette->black);
             lives_widget_color_copy(&palette->normal_fore,&palette->white);
 
@@ -2029,16 +2043,20 @@
             lives_widget_color_copy(&palette->info_text,&palette->black);
             lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
 
-            palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
+            palette->style=STYLE_1|STYLE_2|STYLE_4;
           } else {
             if (!(strcmp(prefs->theme,"crayons"))) {
-              lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+              if (prefs->funky_widgets) {
+                lives_widget_color_copy(&palette->normal_back,&palette->black);
+              } else {
+                lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+              }
               lives_widget_color_copy(&palette->normal_fore,&palette->white);
               lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
               lives_widget_color_copy(&palette->info_base,&palette->grey20);
               lives_widget_color_copy(&palette->info_text,&palette->white);
               lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-              palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
+              palette->style=STYLE_1|STYLE_2|STYLE_4|STYLE_5;
 
             } else {
               palette->style=STYLE_PLAIN;
@@ -2315,6 +2333,10 @@
 
   get_location("cdda2wav",string,256);
   if (strlen(string)) capable->has_cdda2wav=TRUE;
+  else {
+    get_location("icedax",string,256);
+    if (strlen(string)) capable->has_cdda2wav=TRUE;
+  }
 
   get_location("jackd",string,256);
   if (strlen(string)) capable->has_jackd=TRUE;
@@ -2819,6 +2841,8 @@
   ssize_t mynsize;
   char fbuff[PATH_MAX];
 
+  char *tmp;
+
 #ifdef GUI_QT
   qapp = new QApplication(argc,argv);
   qtime = new QTime();
@@ -3004,9 +3028,17 @@
         }
         if (!strcmp(charopt,"yuvin")) {
 #ifdef HAVE_YUV4MPEG
+          char *dir;
           lives_snprintf(prefs->yuvin,PATH_MAX,"%s",optarg);
           prefs->startup_interface=STARTUP_CE;
           ign_opts.ign_stmode=TRUE;
+
+          dir=get_dir(prefs->yuvin);
+          get_basename(prefs->yuvin);
+          lives_snprintf(prefs->yuvin,PATH_MAX,"%s",(tmp=lives_build_filename(dir,prefs->yuvin,NULL)));
+          lives_free(tmp);
+          lives_free(dir);
+
 #else
           LIVES_ERROR("Must have mjpegtools installed for yuvin to work");
 #endif
@@ -3029,14 +3061,30 @@
 #ifdef ENABLE_OSC
         if (!strcmp(charopt,"devicemap")&&optarg!=NULL) {
           // force devicemap loading
-          on_midi_load_activate(NULL, optarg);
+          char *dir;
+          char devmap[PATH_MAX];
+          lives_snprintf(devmap,PATH_MAX,"%s",optarg);
+          dir=get_dir(devmap);
+          get_basename(devmap);
+          lives_snprintf(devmap,PATH_MAX,"%s",(tmp=lives_build_filename(dir,devmap,NULL)));
+          lives_free(tmp);
+          lives_free(dir);
+          on_midi_load_activate(NULL, devmap);
           continue;
         }
 #endif
         if (!strcmp(charopt,"vppdefaults")&&optarg!=NULL) {
+          char *dir;
           // load alternate vpp file
           lives_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s",optarg);
           ign_opts.ign_vppdefs=TRUE;
+
+          dir=get_dir(mainw->vpp_defs_file);
+          get_basename(mainw->vpp_defs_file);
+          lives_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s",(tmp=lives_build_filename(dir,mainw->vpp_defs_file,NULL)));
+          lives_free(tmp);
+          lives_free(dir);
+
           continue;
         }
         if (!strcmp(charopt,"aplayer")) {
@@ -3158,9 +3206,19 @@
       }
       if (optind<argc) {
         // remaining opts are filename [start_time] [end_frame]
+        char *dir;
         lives_snprintf(start_file,PATH_MAX,"%s",argv[optind++]); // filename
         if (optind<argc) start=lives_strtod(argv[optind++],NULL); // start time (seconds)
         if (optind<argc) end=atoi(argv[optind++]); // number of frames
+
+        if (lives_strrstr(start_file,"://")==NULL) {
+          // prepend current directory if needed (unless file contains :// - eg. dvd:// or http://)
+          dir=get_dir(start_file);
+          get_basename(start_file);
+          lives_snprintf(start_file,PATH_MAX,"%s",(tmp=lives_build_filename(dir,start_file,NULL)));
+          lives_free(tmp);
+          lives_free(dir);
+        }
       }
     }
   }
@@ -3270,6 +3328,7 @@
   lives_widget_set_sensitive(mainw->backup, mainw->current_file>0);
   lives_widget_set_sensitive(mainw->save_selection, mainw->current_file>0&&cfile->frames>0&&capable->has_encoder_plugins);
   lives_widget_set_sensitive(mainw->clear_ds, TRUE);
+  lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
   lives_widget_set_sensitive(mainw->playsel, mainw->current_file>0&&cfile->frames>0);
   lives_widget_set_sensitive(mainw->copy, mainw->current_file>0&&cfile->frames>0);
   lives_widget_set_sensitive(mainw->cut, mainw->current_file>0&&cfile->frames>0);
@@ -3298,7 +3357,10 @@
   lives_widget_set_sensitive(mainw->show_file_comments, mainw->current_file>0);
   lives_widget_set_sensitive(mainw->full_screen, TRUE);
   lives_widget_set_sensitive(mainw->mt_menu, TRUE);
-  lives_widget_set_sensitive(mainw->add_live_menu,TRUE);
+  lives_widget_set_sensitive(mainw->unicap,TRUE);
+  lives_widget_set_sensitive(mainw->firewire,TRUE);
+  lives_widget_set_sensitive(mainw->tvdev,TRUE);
+
   lives_widget_set_sensitive(mainw->export_proj, mainw->current_file>0);
   lives_widget_set_sensitive(mainw->import_proj, mainw->current_file==-1);
 
@@ -3316,6 +3378,20 @@
     } else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
   }
 
+  if (mainw->num_rendered_effects_test>0) {
+    lives_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
+  }
+
+  if (mainw->has_custom_gens) {
+    lives_widget_set_sensitive(mainw->custom_gens_submenu,TRUE);
+  }
+
+  if (mainw->has_custom_tools) {
+    lives_widget_set_sensitive(mainw->custom_tools_submenu,TRUE);

LiVES-2.4.2.tar.bz2/src/main.h -> LiVES-2.4.3.tar.bz2/src/main.h Changed

LiVES-2.4.2.tar.bz2/src/mainwindow.h -> LiVES-2.4.3.tar.bz2/src/mainwindow.h Changed

LiVES-2.4.2.tar.bz2/src/multitrack.c -> LiVES-2.4.3.tar.bz2/src/multitrack.c Changed

@@ -24,6 +24,7 @@
 // or adjust the currently playing one
 // and it would be nice to be able to read/write event lists in other formats than the default
 
+//#define DEBUG_TTABLE
 
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
@@ -220,6 +221,7 @@
 
   register int i;
 
+
   if (event_list==NULL) return TRUE;
 
   event=get_first_event(event_list);
@@ -293,6 +295,7 @@
 
   mainw->write_failed=FALSE;
   weed_plant_serialise(fd,event_list,mem);
+
   while (!mainw->write_failed&&event!=NULL) {
 
     next=weed_get_voidptr_value(event,"next",&error);
@@ -732,7 +735,7 @@
 #ifdef IS_MINGW
       setmode(fd,O_BINARY);
 #endif
-      add_markers(mt,mt->event_list);
+      add_markers(mt,mt->event_list,FALSE);
       do_threaded_dialog(_("Auto backup"),FALSE);
 
       set_signal_handlers((SignalHandlerPointer)defer_sigint);
@@ -1712,7 +1715,7 @@
 
 
 void track_select(lives_mt *mt) {
-  LiVESWidget *labelbox,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL;
+  LiVESWidget *labelbox,*label,*hbox,*dummy,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL;
   weed_timecode_t tc;
 
   int hidden=0;
@@ -1752,17 +1755,23 @@
       if (hidden==0) hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
       if (hidden==0) {
         labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+        label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label");
+        dummy=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"dummy");
         ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
         if (mt->current_track==i-mt->opts.back_audio_tracks&&(mt->current_track<0||mt->aud_track_selected)) {
           // audio track is selected
 
           if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
+          if (label!=NULL) lives_widget_set_state(label,LIVES_WIDGET_STATE_PRELIGHT);
+          if (dummy!=NULL) lives_widget_set_state(dummy,LIVES_WIDGET_STATE_PRELIGHT);
           if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
           lives_widget_set_sensitive(mt->jumpback, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
           lives_widget_set_sensitive(mt->jumpnext, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
 
         } else {
           if (labelbox!=NULL&&LIVES_IS_WIDGET(labelbox)) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+          if (label!=NULL) lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+          if (dummy!=NULL) lives_widget_set_state(dummy,LIVES_WIDGET_STATE_NORMAL);
           if (ahbox!=NULL&&LIVES_IS_WIDGET(ahbox)) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
         }
       }
@@ -1774,6 +1783,8 @@
     hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
     if (hidden==0) {
       labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+      label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label");
+      hbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hbox");
       ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
       checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "checkbutton");
       if (i==mt->current_track) {
@@ -1782,9 +1793,14 @@
           if (labelbox!=NULL) {
             lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
           }
+          if (label!=NULL) {
+            lives_widget_set_state(label,LIVES_WIDGET_STATE_PRELIGHT);
+          }
+          if (hbox!=NULL) {
+            lives_widget_set_state(hbox,LIVES_WIDGET_STATE_PRELIGHT);
+          }
           if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
           if (checkbutton!=NULL) {
-            // gtk 3+ idiocy...
             lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
             lives_widget_queue_draw(checkbutton);
             lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
@@ -1794,9 +1810,10 @@
           lives_widget_set_sensitive(mt->jumpnext, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
         } else {
           if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+          if (label!=NULL) lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+          if (hbox!=NULL) lives_widget_set_state(hbox,LIVES_WIDGET_STATE_NORMAL);
           if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
           if (checkbutton!=NULL) {
-            // gtk 3+ idiocy...
             lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
             lives_widget_queue_draw(checkbutton);
             lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
@@ -1825,6 +1842,8 @@
         }
       } else {
         if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+        if (label!=NULL) lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+        if (hbox!=NULL) lives_widget_set_state(hbox,LIVES_WIDGET_STATE_NORMAL);
         if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
         if (checkbutton!=NULL) {
           lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
@@ -2041,6 +2060,7 @@
 
   LiVESWidget *eventbox;
   LiVESWidget *label;
+  LiVESWidget *dummy;
   LiVESWidget *arrow;
   LiVESWidget *checkbutton;
   LiVESWidget *labelbox;
@@ -2106,7 +2126,7 @@
   }
 
   mt->timeline_table = lives_table_new(mt->max_disp_vtracks, 40, TRUE);
-  lives_widget_set_bg_color(LIVES_WIDGET(mt->timeline_table), LIVES_WIDGET_STATE_NORMAL, &palette->white);
+  lives_widget_set_bg_color(LIVES_WIDGET(mt->timeline_table), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
   lives_container_add(LIVES_CONTAINER(mt->tl_eventbox), mt->timeline_table);
 
@@ -2125,6 +2145,7 @@
       expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"expanded"));
 
       label=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"label")));
+      dummy=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"dummy")));
       arrow=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"arrow")));
 
       labelbox=lives_event_box_new();
@@ -2132,6 +2153,7 @@
       ahbox=lives_event_box_new();
 
       lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+      lives_widget_set_state(dummy,LIVES_WIDGET_STATE_NORMAL);
       lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
 
       if (palette->style&STYLE_1) {
@@ -2144,45 +2166,37 @@
           lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
         }
         lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_fg_color(dummy, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
         lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
         lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_bg_color(dummy, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
         lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-        if (palette->style&STYLE_3) {
-          if (labelbox!=NULL) {
-            lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-            lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-          }
-          if (ahbox!=NULL) {
-            lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-            lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-          }
-          lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-          lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-        } else {
-          if (labelbox!=NULL) {
-            lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-            lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-          }
-          if (ahbox!=NULL) {
-            lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-            lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-          }
-          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-          lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-          lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+
+        if (labelbox!=NULL) {
+          lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
         }
+        if (ahbox!=NULL) {
+          lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        }
+        lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+        lives_widget_set_bg_color(dummy, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+        lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+        lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        lives_widget_set_fg_color(dummy, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
       }
       lives_container_add(LIVES_CONTAINER(labelbox), hbox);
       lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
       lives_container_add(LIVES_CONTAINER(ahbox), arrow);

LiVES-2.4.2.tar.bz2/src/multitrack.h -> LiVES-2.4.3.tar.bz2/src/multitrack.h Changed

LiVES-2.4.2.tar.bz2/src/paramwindow.c -> LiVES-2.4.3.tar.bz2/src/paramwindow.c Changed

@@ -580,7 +580,10 @@
   for (i=0; i<num_chans; i++) {
     tmpl=ctmpls[i];
 
-    // TODO *** - "host_disabled" should be for inst, not template !
+    // TODO ***: allow alteration of "host_disabled" under some circumstances
+    // (e.g. allow enabling a first or second in channel, or first out_channel, or more for alphas)
+
+    // make this into function called from here and from effects with optional enable-able channels
     if (weed_plant_has_leaf(tmpl,"host_disabled")&&weed_get_boolean_value(tmpl,"host_disabled",&error)==WEED_TRUE) continue;
     if (weed_plant_has_leaf(tmpl,"width")&&weed_get_int_value(tmpl,"width",&error)!=0) continue;
     if (weed_plant_has_leaf(tmpl,"height")&&weed_get_int_value(tmpl,"height",&error)!=0) continue;
@@ -963,6 +966,9 @@
     if (lives_widget_get_parent(okbutton)!=NULL) {
       lives_widget_set_can_focus_and_default(okbutton);
       lives_widget_grab_default(okbutton);
+    } else {
+      lives_widget_set_can_focus_and_default(cancelbutton);
+      lives_widget_grab_default(cancelbutton);
     }
 
     lives_widget_show_all(fx_dialog[didx]);

LiVES-2.4.2.tar.bz2/src/preferences.c -> LiVES-2.4.3.tar.bz2/src/preferences.c Changed

LiVES-2.4.2.tar.bz2/src/preferences.h -> LiVES-2.4.3.tar.bz2/src/preferences.h Changed

LiVES-2.4.2.tar.bz2/src/resample.c -> LiVES-2.4.3.tar.bz2/src/resample.c Changed

LiVES-2.4.2.tar.bz2/src/rfx-builder.c -> LiVES-2.4.3.tar.bz2/src/rfx-builder.c Changed

@@ -96,6 +96,8 @@
 
   LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
+  int winsize_h,winsize_v;
+
   char *tmp,*tmp2,*title,*string;
 
   rfxbuilder->rfx_version=lives_strdup(RFX_VERSION);
@@ -135,26 +137,25 @@
     title=lives_strdup(_("LiVES: - Edit Test RFX"));
   }
 
-  rfxbuilder->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  winsize_h=(PREF_RFXDIALOG_W<mainw->scr_width-SCR_WIDTH_SAFETY/5.)?PREF_RFXDIALOG_W:mainw->scr_width-SCR_WIDTH_SAFETY/5.;
+  winsize_v=(PREF_RFXDIALOG_H<mainw->scr_height-SCR_HEIGHT_SAFETY/2.)?PREF_RFXDIALOG_H:mainw->scr_height-SCR_HEIGHT_SAFETY/2.;
+
+  rfxbuilder->dialog = lives_standard_dialog_new(title,FALSE,winsize_h,winsize_v);
   lives_free(title);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(rfxbuilder->dialog),LIVES_WINDOW(mainw->LiVES));
   }
 
-
   lives_window_add_accel_group(LIVES_WINDOW(rfxbuilder->dialog), accel_group);
 
-  lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->dialog), widget_opts.border_width>>1);
-
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(rfxbuilder->dialog));
+  lives_container_set_border_width(LIVES_CONTAINER(lives_widget_get_parent(dialog_vbox)), widget_opts.border_width>>1);
 
   top_vbox = lives_vbox_new(FALSE, 0);
 
-  scrollw = lives_standard_scrolled_window_new((PREF_RFXDIALOG_W<mainw->scr_width-20.*widget_opts.scale)?
-            PREF_RFXDIALOG_W:mainw->scr_width-20.*widget_opts.scale,
-            (PREF_RFXDIALOG_H<mainw->scr_height-60.*widget_opts.scale)?
-            PREF_RFXDIALOG_H:mainw->scr_height-60.*widget_opts.scale,top_vbox);
+  scrollw = lives_standard_scrolled_window_new(winsize_h,winsize_v,top_vbox);
+
   lives_box_pack_start(LIVES_BOX(dialog_vbox), scrollw, TRUE, TRUE, 0);
 
   // types
@@ -510,7 +511,6 @@
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
   LiVESWidget *hbox;
-  LiVESWidget *vseparator;
   LiVESWidget *button_box;
 
   // buttons
@@ -551,7 +551,7 @@
     rfxbuilder->onum_triggers=rfxbuilder->num_triggers;
   }
 
-  dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  dialog = lives_standard_dialog_new(title,FALSE,RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4);
   if (title!=NULL) lives_free(title);
 
   lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
@@ -598,14 +598,13 @@
 
   lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4,rfxbuilder->table);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V/4,rfxbuilder->table);
 
-  lives_box_pack_start(LIVES_BOX(hbox),scrolledwindow,FALSE,FALSE,widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox),scrolledwindow,TRUE,TRUE,widget_opts.packing_width);
 
+  add_vsep_to_box(LIVES_BOX(hbox));
 
   // button box on right
-  vseparator = lives_vseparator_new();
-  lives_box_pack_start(LIVES_BOX(hbox), vseparator, TRUE, TRUE, widget_opts.packing_width);
 
   button_box=lives_vbutton_box_new();
   lives_box_pack_start(LIVES_BOX(hbox), button_box, FALSE, FALSE, 0);
@@ -1331,6 +1330,7 @@
 
     lives_widget_destroy(param_window_dialog);
     lives_widget_queue_resize(lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
+    lives_widget_queue_resize(LIVES_WIDGET(rfxbuilder->table));
     break;
 
 
@@ -1385,6 +1385,7 @@
 
     lives_widget_destroy(trigger_dialog);
     lives_widget_queue_resize(lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
+    lives_widget_queue_resize(LIVES_WIDGET(rfxbuilder->table));
 
     break;
   default:
@@ -2722,7 +2723,7 @@
     title=lives_strdup(_("LiVES: - Edit RFX Trigger"));
   }
 
-  dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  dialog = lives_standard_dialog_new(title,TRUE,PREF_RFXDIALOG_W,PREF_RFXDIALOG_H);
   lives_free(title);
 
   if (prefs->show_gui) {
@@ -2802,7 +2803,7 @@
 
   char *tmpx;
 
-  dialog = lives_standard_dialog_new(NULL,FALSE,-1,-1);
+  dialog = lives_standard_dialog_new(NULL,FALSE,PREF_RFXDIALOG_W,PREF_RFXDIALOG_H);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));

LiVES-2.4.2.tar.bz2/src/rfx-builder.h -> LiVES-2.4.3.tar.bz2/src/rfx-builder.h Changed

LiVES-2.4.2.tar.bz2/src/rte_window.c -> LiVES-2.4.3.tar.bz2/src/rte_window.c Changed

@@ -1642,13 +1642,14 @@
 void on_rte_info_clicked(LiVESButton *button, livespointer user_data) {
   weed_plant_t *filter;
 
-  LiVESWidget *rte_info_window;
+  LiVESWidget *dialog;
+  LiVESWidget *dialog_action_area;
+
   LiVESWidget *vbox;
   LiVESWidget *hbox;
   LiVESWidget *label;
   LiVESWidget *textview;
 
-  LiVESWidget *hbuttonbox;
   LiVESWidget *ok_button;
 
   char *filter_name;
@@ -1688,52 +1689,46 @@
 
   filter_version=weed_get_int_value(filter,"version",&weed_error);
 
-  rte_info_window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
-  lives_window_set_title(LIVES_WINDOW(rte_info_window), lives_strdup_printf(_("LiVES: Information for %s"),filter_name));
-  if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color(rte_info_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  }
+  tmp=lives_strdup_printf(_("LiVES: Information for %s"),filter_name);
 
-  lives_container_set_border_width(LIVES_CONTAINER(rte_info_window), widget_opts.border_width);
-  lives_window_set_transient_for(LIVES_WINDOW(rte_info_window),LIVES_WINDOW(lives_widget_get_toplevel(LIVES_WIDGET(button))));
+  dialog=lives_standard_dialog_new(tmp,FALSE,RTE_INFO_WIDTH,RTE_INFO_HEIGHT);
 
-  lives_window_set_default_size(LIVES_WINDOW(rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT);
+  lives_free(tmp);
 
-  vbox = lives_vbox_new(FALSE, widget_opts.packing_height*2);
-  lives_container_add(LIVES_CONTAINER(rte_info_window), vbox);
+  vbox=lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
   label = lives_standard_label_new((tmp=lives_strdup_printf(_("Effect name: %s"),filter_name)));
   lives_free(tmp);
-  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
 
   label = lives_standard_label_new((tmp=lives_strdup_printf(_("Type: %s"),type)));
   lives_free(tmp);
-  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
 
   label = lives_standard_label_new((tmp=lives_strdup_printf(_("Plugin name: %s"),plugin_name)));
   lives_free(tmp);
-  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
 
   label = lives_standard_label_new((tmp=lives_strdup_printf(_("Author: %s"),filter_author)));
   lives_free(tmp);
-  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
 
   if (filter_extra_authors!=NULL) {
     label = lives_standard_label_new((tmp=lives_strdup_printf(_("and: %s"),filter_extra_authors)));
     lives_free(tmp);
-    lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
   }
 
   label = lives_standard_label_new((tmp=lives_strdup_printf(_("Version: %d"),filter_version)));
   lives_free(tmp);
-  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, widget_opts.packing_height);
 
   if (has_desc) {
     hbox = lives_hbox_new(FALSE, widget_opts.packing_width);
-    lives_box_pack_start(LIVES_BOX(vbox), hbox, TRUE, FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, TRUE, FALSE, widget_opts.packing_height);
 
     label = lives_standard_label_new(_("Description: "));
-    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_height);
 
     textview = lives_text_view_new();
 
@@ -1747,20 +1742,18 @@
     lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE);
 
     lives_text_view_set_text(LIVES_TEXT_VIEW(textview), filter_description,-1);
-    lives_box_pack_start(LIVES_BOX(hbox), textview, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), textview, TRUE, TRUE, widget_opts.packing_height);
   }
 
-  hbuttonbox = lives_hbutton_box_new();
-  lives_box_pack_start(LIVES_BOX(vbox), hbuttonbox, TRUE, TRUE, 0);
 
   ok_button = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
-  lives_widget_show(ok_button);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), ok_button, LIVES_RESPONSE_OK);
 
-  lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
   lives_widget_set_can_focus_and_default(ok_button);
   lives_widget_grab_default(ok_button);
 
-  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), ok_button, DEF_BUTTON_WIDTH);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(dialog_action_area), ok_button, DEF_BUTTON_WIDTH*4);
 
   lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL,
                        LIVES_GUI_CALLBACK(lives_general_button_clicked),
@@ -1773,8 +1766,8 @@
   lives_free(plugin_name);
   lives_free(type);
 
-  lives_widget_show_all(rte_info_window);
-  lives_window_center(LIVES_WINDOW(rte_info_window));
+  lives_widget_show_all(dialog);
+  lives_window_center(LIVES_WINDOW(dialog));
 }

LiVES-2.4.2.tar.bz2/src/startup.c -> LiVES-2.4.3.tar.bz2/src/startup.c Changed

@@ -1,6 +1,6 @@
 // startup.c
 // LiVES
-// (c) G. Finch 2010 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2010 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -200,10 +200,18 @@
 
 
 boolean do_audio_choice_dialog(short startup_phase) {
-  LiVESWidget *dialog,*dialog_vbox,*radiobutton0,*radiobutton1,*radiobutton2,*radiobutton3,*radiobutton4,*label;
+  LiVESWidget *dialog,*dialog_vbox,*radiobutton2,*radiobutton3,*radiobutton4,*label;
   LiVESWidget *okbutton,*cancelbutton;
   LiVESWidget *hbox;
 
+#ifdef HAVE_PULSE_AUDIO
+  LiVESWidget *radiobutton0;
+#endif
+
+#ifdef ENABLE_JACK
+  LiVESWidget *radiobutton1;
+#endif
+
   LiVESAccelGroup *accel_group;
 
   LiVESSList *radiobutton_group = NULL;
@@ -385,14 +393,14 @@
   }
 
   cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
-  lives_widget_show(cancelbutton);
+
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
   lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
                                LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD,_("_Next"));
-  lives_widget_show(okbutton);
+
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
@@ -557,7 +565,7 @@
   lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
 
   cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
-  lives_widget_show(cancelbutton);
+
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
   lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
@@ -566,7 +574,7 @@
   if (!tshoot) {
     okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD,_("_Next"));
   } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
-  lives_widget_show(okbutton);
+
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);

LiVES-2.4.2.tar.bz2/src/utils.c -> LiVES-2.4.3.tar.bz2/src/utils.c Changed

@@ -2343,19 +2343,15 @@
   //filename should point to char[PATH_MAX]
 
   lives_snprintf(filename,PATH_MAX,"%s%s",(tmp=lives_path_get_dirname(filename)),LIVES_DIR_SEPARATOR_S);
-  lives_free(tmp);
-
-  if (!strcmp(filename,"//")) {
-    memset(filename+1,0,1);
-    return;
-  }
-
-  if (!strncmp(filename,"./",2)) {
-    char *tmp1=lives_get_current_dir(),*tmp=lives_build_filename(tmp1,filename+2,NULL);
+  if (!strcmp(tmp,".")) {
+    char *tmp1=lives_get_current_dir(),*tmp2=lives_build_filename(tmp1,filename+2,NULL);
     lives_free(tmp1);
-    lives_snprintf(filename,PATH_MAX,"%s",tmp);
-    lives_free(tmp);
+    lives_snprintf(filename,PATH_MAX,"%s",tmp2);
+    lives_free(tmp2);
   }
+
+  lives_free(tmp);
+
 }
 
 
@@ -2376,6 +2372,7 @@
   lives_free(tmp);
 }
 
+
 void get_filename(char *filename, boolean strip_dir) {
   // get filename (part without extension) of a file
   //filename should point to char[PATH_MAX]
@@ -2658,6 +2655,10 @@
   // update the on-screen timer bars,
   // and if we are not playing,
   // get play times for video, audio channels, and total (longest) time
+
+  // TODO *** colour_config
+
+
   char *tmpstr;
 
   double offset=0;
@@ -2738,7 +2739,11 @@
     if (mainw->video_drawable!=NULL) {
       lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
 
-      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      } else {
+        lives_painter_set_source_rgb(cr, .1, .1, .1); ///< opaque grey
+      }
 
       lives_painter_rectangle(cr,0,0,
                               cfile->video_time/cfile->total_time*allocwidth-1,
@@ -2778,7 +2783,11 @@
     if (mainw->laudio_drawable!=NULL) {
       lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
 
-      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      } else {
+        lives_painter_set_source_rgb(cr, .1, .1, .1); ///< opaque grey
+      }
 
       lives_painter_rectangle(cr,0,0,
                               cfile->laudio_time/cfile->total_time*allocwidth-1,
@@ -2805,7 +2814,11 @@
       if (mainw->raudio_drawable!=NULL) {
         lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
 
-        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+          lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        } else {
+          lives_painter_set_source_rgb(cr, .1, .1, .1); ///< opaque grey
+        }
 
         lives_painter_rectangle(cr,0,0,
                                 cfile->raudio_time/cfile->total_time*allocwidth-1,

LiVES-2.4.2.tar.bz2/src/videodev.c -> LiVES-2.4.3.tar.bz2/src/videodev.c Changed

LiVES-2.4.2.tar.bz2/src/widget-helper-gtk.h -> LiVES-2.4.3.tar.bz2/src/widget-helper-gtk.h Changed

LiVES-2.4.2.tar.bz2/src/widget-helper.c -> LiVES-2.4.3.tar.bz2/src/widget-helper.c Changed

@@ -629,6 +629,20 @@
 LIVES_INLINE boolean lives_widget_set_sensitive(LiVESWidget *widget, boolean state) {
 #ifdef GUI_GTK
   gtk_widget_set_sensitive(widget,state);
+
+#ifdef GTK_SUBMENU_SENS_BUG
+  if (GTK_IS_MENU_ITEM(widget)) {
+    LiVESWidget *sub;
+    if ((sub=gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))!=NULL) {
+      g_object_ref(sub);
+      gtk_menu_item_set_submenu(GTK_MENU_ITEM(widget),NULL);
+      gtk_widget_set_sensitive(sub,state);
+      gtk_menu_item_set_submenu(GTK_MENU_ITEM(widget),sub);
+      g_object_unref(sub);
+    }
+  }
+#endif
+
   return TRUE;
 #endif
 #ifdef GUI_QT
@@ -1008,7 +1022,7 @@
 
 LIVES_INLINE boolean lives_event_box_set_above_child(LiVESEventBox *ebox, boolean set) {
 #ifdef GUI_GTK
-  lives_event_box_set_above_child(ebox,set);
+  gtk_event_box_set_above_child(ebox,set);
   return TRUE;
 #endif
 #ifdef GUI_QT
@@ -1807,7 +1821,7 @@
     LiVESError **error) {
 
 #ifdef GUI_GTK
-  return lives_pixbuf_new_from_file_at_scale(filename, width, height, preserve_aspect_ratio, error);
+  return gdk_pixbuf_new_from_file_at_scale(filename, width, height, preserve_aspect_ratio, error);
 #endif
 
 #ifdef GUI_QT
@@ -6019,6 +6033,14 @@
 LIVES_INLINE boolean lives_menu_item_set_submenu(LiVESMenuItem *menuitem, LiVESWidget *menu) {
 #ifdef GUI_GTK
   gtk_menu_item_set_submenu(menuitem,menu);
+
+#ifdef GTK_SUBMENU_SENS_BUG
+  if (!lives_widget_is_sensitive(LIVES_WIDGET(menuitem))) {
+    g_print("Warning, adding submenu when insens!");
+    //assert(FALSE);
+  }
+#endif
+
   return TRUE;
 #endif
 #ifdef GUI_QT
@@ -7567,8 +7589,6 @@
   lives_widget_set_hexpand(dialog,TRUE);
   lives_widget_set_vexpand(dialog,TRUE);
 
-  lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2);
-
   if (widget_opts.apply_theme) {
     lives_widget_apply_theme(dialog, LIVES_WIDGET_STATE_NORMAL);
 
@@ -7577,6 +7597,13 @@
 #endif
   }
 
+  if (widget_opts.apply_theme) {
+    funkify_dialog(dialog);
+  } else {
+    lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2);
+  }
+
+
   // do this before widget_show(), then call lives_window_center() afterwards
   lives_window_set_position(LIVES_WINDOW(dialog),LIVES_WIN_POS_CENTER_ALWAYS);
 
@@ -8101,6 +8128,7 @@
   if (!mainw->is_exiting&&mt_needs_idlefunc) mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
 
   pthread_mutex_unlock(&mainw->gtk_mutex);
+
   return TRUE;
 
 }
@@ -8284,6 +8312,47 @@
 }
 
 
+void funkify_dialog(LiVESWidget *dialog) {
+  if (prefs->funky_widgets) {
+    LiVESWidget *frame=lives_frame_new(NULL);
+    LiVESWidget *box=lives_vbox_new(FALSE,0);
+    LiVESWidget *content=lives_dialog_get_content_area(LIVES_DIALOG(dialog));
+    LiVESWidget *action=lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+    LiVESWidget *label=lives_label_new("");
+
+    lives_container_set_border_width(LIVES_CONTAINER(dialog),0);
+
+    if (widget_opts.apply_theme) {
+      lives_widget_set_fg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+      lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    }
+
+    lives_object_ref(content);
+    lives_object_ref(action);
+
+    lives_widget_unparent(content);
+    lives_widget_unparent(action);
+
+    lives_container_add(LIVES_CONTAINER(dialog),frame);
+    lives_container_add(LIVES_CONTAINER(frame),box);
+
+    lives_box_pack_start(LIVES_BOX(box),content,TRUE,TRUE,0);
+
+    lives_box_pack_start(LIVES_BOX(box),label,FALSE,TRUE,0);
+
+    lives_box_pack_start(LIVES_BOX(box),action,FALSE,TRUE,0);
+
+    lives_widget_show_all(frame);
+
+    lives_container_set_border_width(LIVES_CONTAINER(box), widget_opts.border_width*2);
+  } else {
+    lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2);
+  }
+
+}
+
+
+
 void get_border_size(LiVESWidget *win, int *bx, int *by) {
 #ifdef GUI_GTK
   GdkRectangle rect;

LiVES-2.4.2.tar.bz2/src/widget-helper.h -> LiVES-2.4.3.tar.bz2/src/widget-helper.h Changed

LiVES-2.4.2.tar.bz2/tools/lives-glc-play -> LiVES-2.4.3.tar.bz2/tools/lives-glc-play Changed

LiVES-2.4.2.tar.bz2/tools/lives-glc-play-norun -> LiVES-2.4.3.tar.bz2/tools/lives-glc-play-norun Changed