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 27

LiVES.changes Changed

LiVES.spec Changed

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

@@ -1,3 +1,28 @@
+Version 2.4.2 (12 September 2015)
+---------------------------------
+Fix crash after recording with pulseaudio external audio.
+Fix possible crash when converting from YUV420 to UYVY / YUYV.
+Fix memory issue in audio triggered video generators.
+Fix buttons issue in the progress dialog (regression).
+Fix occasional hang in shutdown via OSC.
+Minor fixes for headless (nogui, noplaywin) modes.
+Increase size of debug output window when encoding (Regression).
+Fix for compiling without jack.
+Fix crash in mask_overlay effect.
+Fix some threading problems when running audio and video effects together.
+Improve OSC responsiveness during playback.
+Fixes for beat_detector, edge, vector_visualiser, and kaleidoscope plugins.
+Fix latency issue with pulseaudio external input.
+Fix for opening unicap device during playback.
+Work around gtk+ bug for clips menu.
+Implement OSC commands /audio/mute/set, /audio/mute/get, /audio/volume/set, /audio/volume/get and /clip/open/unicap.
+Fixes / refactoring for firewire grabbing.
+Re-enable button icons (via preference) and clean up stock button code.
+
+
+
+
+
 Version 2.4.1 (9 Aug 2015)
 --------------------------
 NOTE: the LiVES homepage has moved to http://lives-video.com

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

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

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

LiVES-2.4.1.tar.bz2/configure -> LiVES-2.4.2.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.1.
+# Generated by GNU Autoconf 2.69 for LiVES 2.4.2.
 #
 # 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.1'
-PACKAGE_STRING='LiVES 2.4.1'
+PACKAGE_VERSION='2.4.2'
+PACKAGE_STRING='LiVES 2.4.2'
 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.1 to adapt to many kinds of systems.
+\`configure' configures LiVES 2.4.2 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.1:";;
+     short | recursive ) echo "Configuration of LiVES 2.4.2:";;
    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.1
+LiVES configure 2.4.2
 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.1, which was
+It was created by LiVES $as_me 2.4.2, 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.1'
+ VERSION='2.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23830,6 +23830,18 @@
 done
 
 
+for ac_func in posix_fadvise
+do :
+  ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
+if test "x$ac_cv_func_posix_fadvise" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_POSIX_FADVISE 1
+_ACEOF
+
+fi
+done
+
+
 
 for ac_prog in perl perl5
 do
@@ -29536,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.1, which was
+This file was extended by LiVES $as_me 2.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29593,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.1
+LiVES config.status 2.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

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

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

LiVES-2.4.1.tar.bz2/libweed/weed-compat.h -> LiVES-2.4.2.tar.bz2/libweed/weed-compat.h Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder3 Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder Changed

LiVES-2.4.1.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 -> LiVES-2.4.2.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 Changed

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

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

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/beat_detector.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/beat_detector.c Changed

@@ -206,7 +206,6 @@
     goto done;
   }
 
-
   rate=weed_get_int_value(in_channel,"audio_rate",&error);
 
   chans=weed_get_int_value(in_channel,"audio_channels",&error);
@@ -224,6 +223,7 @@
         sdata->buf[i][j]=sdata->buf[i][j+1];
         if (sdata->buf[i][j]!=-1.) sdata->av[i]+=(double)sdata->buf[i][j];
       }
+
     }
 
     has_data=WEED_TRUE;
@@ -236,6 +236,11 @@
   }
 
   sdata->totsamps+=onsamps;
+
+  for (j=0; j<sdata->bufidx; j++) {
+    sdata->bufsize[j]=sdata->bufsize[j+1];
+  }
+
   sdata->bufsize[sdata->bufidx]=onsamps;
 
   for (s=0; s<NSLICES; s++) {
@@ -320,6 +325,7 @@
         totx/=((float)rkmax-(float)rkmin+1.);
 
         // store this value in the buffer
+
         sdata->buf[s][sdata->bufidx]+=totx/(float)chans;
 
         okmin=kmin;
@@ -358,6 +364,7 @@
         ) {
           varx=(val1-val2);
           if (varx<0.) varx=0.;
+          if (varx>1000.) varx=0.; // ignore invalid value
           var+=(double)varx/(double)ONSET_WINDOW;
         }
       }
@@ -372,6 +379,8 @@
 
   for (i=0; i<NSLICES; i++) {
     av=sdata->av[i]/(double)sdata->bufidx;
+    //if (i==0) printf("VALS %.2f %.2f %.2f %.2f %.2f %d %d %d %d %d\n",var,varlim,sdata->buf[i][sdata->bufidx],avlim*av,sdata->av[i],sdata->bufidx,sdata->totsamps,onsamps,base,rndlog2(onsamps));
+
     if (var>=varlim && sdata->buf[i][sdata->bufidx] >= (avlim*av)) {
       // got a beat !
       beat_pulse=beat_hold=WEED_TRUE;
@@ -384,6 +393,9 @@
   //fprintf(stderr,"\n\n");
 
 done:
+  //if (beat_hold) printf("BEAT %p !\n",out_params[1]);
+  //else printf("NOBEAT %.2f\n",osrc!=NULL?osrc[0]:1.23);
+
   weed_set_boolean_value(out_params[0],"value",beat_pulse);
   weed_set_int64_value(out_params[0],"timecode",timestamp);
   weed_set_boolean_value(out_params[1],"value",beat_hold);

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/cairo/vector_visualiser.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/cairo/vector_visualiser.c Changed

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/edge.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/edge.c Changed

@@ -88,9 +88,9 @@
 }
 
 
-static inline RGB32 copywalpha(RGB32 *dest, RGB32 *src, size_t offs, RGB32 val) {
+static inline RGB32 copywalpha(RGB32 *dest, RGB32 *src, size_t ioffs, size_t ooffs, RGB32 val) {
   // copy alpha from src, and RGB from val; return val
-  dest[offs]=(src[offs]&0xff000000)|(val&0xffffff);
+  dest[ooffs]=(src[ioffs]&0xff000000)|(val&0xffffff);
   return val;
 }
 
@@ -100,22 +100,30 @@
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
                            &error);
   RGB32 *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
-  RGB32 *dest=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+  RGB32 *dest=weed_get_voidptr_value(out_channel,"pixel_data",&error),*odest=dest;
   int video_width=weed_get_int_value(in_channel,"width",&error);
   int video_height=weed_get_int_value(in_channel,"height",&error);
   int r,g,b;
   static_data *sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   RGB32 *map=sdata->map;
+
   int map_width=video_width/4;
-  int map_height=video_height/4;
+  int map_height=video_height;
+
   register int x, y;
   RGB32 p, q;
   RGB32 v0, v1, v2, v3;
-  int video_width_margin = video_width - video_width/4 * 4;
-  int row=video_width*3+8+video_width_margin;
 
-  src += video_width*4+4;
-  dest += video_width*4+4;
+  //int video_width_margin = video_width - video_width/4 * 4;
+  //int row=video_width*3+8+video_width_margin;
+
+  int irow=weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  int irowx = irow - video_width + 2;
+  int orow=weed_get_int_value(out_channel,"rowstrides",&error)/4;
+  int orowx = orow - video_width + 2;
+
+  src += video_width+1;
+  dest += video_width+1;
 
   for (y=1; y<map_height-1; y++) {
     for (x=1; x<map_width-1; x++) {
@@ -138,7 +146,7 @@
       v2 = (r<<17)|(g<<9)|b;
 
       /* difference between the current pixel and upper neighbor. */
-      q = *(src - video_width*4);
+      q = *(src - irow);
       r = ((int)(p & 0xff0000) - (int)(q & 0xff0000))>>16;
       g = ((int)(p & 0x00ff00) - (int)(q & 0x00ff00))>>8;
       b = ((int)(p & 0x0000ff) - (int)(q & 0x0000ff));
@@ -153,29 +161,35 @@
       if (b>255) b = 255;
       v3 = (r<<17)|(g<<9)|b;
 
-      map[y*map_width*2+x*2+1] = copywalpha(dest,src,2,copywalpha(dest,src,3,copywalpha(dest,src,video_width+2,copywalpha(dest,src,video_width+3,
-                                            v3))));
-      map[y*map_width*2+x*2] = copywalpha(dest,src,video_width*2,copywalpha(dest,src,video_width*2+1,copywalpha(dest,src,video_width*3,
-                                          copywalpha(dest,src,video_width*3+1,v2))));
+      map[y*map_width*2+x*2+1] = copywalpha(dest,src,2,2,copywalpha(dest,src,3,3,copywalpha(dest,src,irow+2,orow+2,
+                                            copywalpha(dest,src,irow+3,orow+3,
+                                                v3))));
+      map[y*map_width*2+x*2] = copywalpha(dest,src,irow*2,orow*2,copywalpha(dest,src,irow*2+1,orow*2+1,
+                                          copywalpha(dest,src,irow*3,orow*3,
+                                              copywalpha(dest,src,irow*3+1,orow*3+1,v2))));
 
       v0 = map[(y-1)*map_width*2+x*2];
       v1 = map[y*map_width*2+(x-1)*2+1];
 
       g = (r=v0+v1) & 0x01010100;
-      copywalpha(dest,src,0,r | (g - (g>>8)));
+      copywalpha(dest,src,0,0,r | (g - (g>>8)));
       g = (r=v0+v3) & 0x01010100;
-      copywalpha(dest,src,1,r | (g - (g>>8)));
+      copywalpha(dest,src,1,1,r | (g - (g>>8)));
       g = (r=v2+v1) & 0x01010100;
-      copywalpha(dest,src,video_width,r | (g - (g>>8)));
+      copywalpha(dest,src,irow,orow,r | (g - (g>>8)));
       g = (r=v2+v3) & 0x01010100;
-      copywalpha(dest,src,video_width+1,r | (g - (g>>8)));
+      copywalpha(dest,src,irow+1,orow+1,r | (g - (g>>8)));
 
       src += 4;
       dest += 4;
     }
-    src += row;
-    dest += row;
+    src += irowx;
+    dest += orowx;
   }
+
+  weed_memset(dest,0,orow*4-4);
+  weed_memset(odest,0,orow*4+4);
+
   return WEED_NO_ERROR;
 }

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c Changed

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c Changed

LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/kaleidoscope.c -> LiVES-2.4.2.tar.bz2/lives-plugins/weed-plugins/kaleidoscope.c Changed

LiVES-2.4.1.tar.bz2/po/ar.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، "
 "وإصدارة البرنامج."
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "وأية معلومات موضحة أدناه.\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "المعلومات.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "أيّ"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "بدون"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "مستحسن"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "معطّل !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "مُضمَّن"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "مخصص"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "اختبار"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_خلفية بيضاء"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/ca.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Gràcies. La recuperació ha de ser possible si es reinicia LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Quan es notifiqui una falla, si us plau poseu les dades del vostre sistema "
 "operatiu, distribució i la versió de LIVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "Tot seguit hi haurà alguna informació:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "informació.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "qualsevol"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "Recomanat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "Espatllat"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Incorporat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personalitzat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Comprova"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Inici"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/cs.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -20,7 +20,7 @@
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Language: Czech\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -29,22 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -58,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -70,7 +70,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -78,91 +78,91 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Libovolný"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Žádný"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "doporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "zakázáno!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Vestavěno"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Vlastní"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdné pozadí"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -174,114 +174,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/da.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -51,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -59,97 +59,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Enhver"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "anbefalet"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Indbygget"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Brugerdefineret"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Start farve"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -161,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1828
+#: src/main.c:1832
 msgid "mplayer2...detected..."
 msgstr ""

LiVES-2.4.1.tar.bz2/po/de_DE.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -15,7 +15,7 @@
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -24,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Warnung: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Kritischer Fehler: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Fataler Fehler: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -54,7 +54,7 @@
 "Danke. Projektwiederherstellung sollte beim nächsten Start von LiVES möglich "
 "sein.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -66,7 +66,7 @@
 "Absturzberichte bitte mit Details über das Betriebssystem, Distribution und "
 "die LiVES-Version versehen ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -74,7 +74,7 @@
 "und die Informationen, die unten angezeigt werden:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -84,83 +84,83 @@
 "um weitere Informationen zu sammeln\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Set wird erhalten.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Beliebig"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "empfohlen"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "deaktiviert!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Momentanes Layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Eingebaut"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeit-Effekt Plugins..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Jack Audio Server wird gestartet..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Jack Transport Server wird gestartet..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Verbindung zum Jack Transport Server wird hergestellt..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,114 @@
 "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu "
 "starten, oder "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "PulseAudio Server wird gestartet..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Optionale Abhängigkeiten werden überprüft:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...gefunden..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NICHT GEFUNDEN..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/en_GB.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2015-05-03 15:40+0000\n"
 "X-Generator: Launchpad (build 17474)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Warning: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Critical error: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Fatal error: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -61,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -73,7 +73,7 @@
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -81,7 +81,7 @@
 "and any information shown below:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -91,83 +91,83 @@
 "information.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Any"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "None"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recommended"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "disabled !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Custom"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Foreground"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Background"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Starting jack transport server..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Connecting to jack transport server..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -186,114 +186,114 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/es.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:12+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Aviso: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Error crítico: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Error grave: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -61,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Gracias. Debería poder recuperar su sesión reiniciando LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -73,7 +73,7 @@
 "Cuando informe del problema, incluya detalles de su sistema operativo, "
 "distribución, y la versión de LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -81,7 +81,7 @@
 "y la información mostrada debajo:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -91,83 +91,83 @@
 "información.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservando el conjunto.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Cualquiera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "desactivado"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Integrado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Prueba"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Frente"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Fondo"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -179,114 +179,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/et.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Aitäh. Peaks olema võimalik progress taastada LiVES-i taaskäivitusel.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest "
 "ja LiVES-i versioonist ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "ja mis tahes allpool esitatud teave:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "infot.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Kõik"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Pole"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "soovitatav"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "keelatud !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Sisseehitatud"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Kohandatud"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Testi"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Alusta"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/fi.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +62,7 @@
 "Kiitos. Palautumisen tulisi olla mahdollista uudelleen käynnistäessäsi "
 "ohjelman.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -74,7 +74,7 @@
 "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, "
 "jakeluversio ja LiVESin versiotiedot ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +82,7 @@
 "ja alla olevat tiedot:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,84 +92,84 @@
 "lisätietoja.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Mikä tahansa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Ei mitään"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "suositeltu"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 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:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Mukauta"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Kokeile"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "P_imennä tausta"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/fr.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -22,7 +22,7 @@
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -31,22 +31,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Avertissement : %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Erreur critique : %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Erreur fatale : %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -60,7 +60,7 @@
 "group_id=64341&atid=507139\n"
 "Merci. Une récupération devrait être possible si vous redémarrez LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -72,7 +72,7 @@
 "Lors des signalements de plantages, veuillez inclure les détails de votre "
 "système d'exploitation, la distribution, et la version de LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -80,7 +80,7 @@
 "et toute autre information indiquée ci-dessous :\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -90,83 +90,83 @@
 "recueillir plus d'informations.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Tous"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recommandé"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "désactivé !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Intégré"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Essai"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Premier plan"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Arrière plan"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des greffons d'effets en temps réel…"
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Démarrage du serveur de transport jack..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport jack..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -178,114 +178,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Vérification des dépendances optionnelles :"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer... détecté..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NON DÉTECTÉ..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/gl.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
 "X-Generator: Launchpad (build 17474)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Aviso: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Erro crítico: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Erro grave: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Grazas. Deber ser posíbel a recuperación se reinicia LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Cando informe de quebras, inclúa os detalles do seu sistema operativo, "
 "distribución, e a versión de LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "e calquera outra información amosada embaixo:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,83 +86,83 @@
 "información.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservar o conxunto.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Calquera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Ningún"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "desactivado !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Incorporado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Proba"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Primeiro plano"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Fondo"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tempo real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Iniciando o servidor de son jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor de transporte jack..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Conectando co servidor de transporte jack..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -174,114 +174,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Comprobando as dependencias opcionais:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTADO..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/he.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -61,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -73,7 +73,7 @@
 "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES "
 "שבשימוש ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -81,7 +81,7 @@
 "וכל מידע זמין מוצג כאן:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -91,84 +91,84 @@
 "מידע.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "הכל"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "ללא"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "מומלץ"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "נוטרל !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "מובנה"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "מותאם אישית"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "רקע _שחור"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -180,114 +180,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/hr.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Hvala. Oporavak bi trebao biti moguće ako se ponovno LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Kada izvještavanje crashes, molimo uključite detalje vašeg operacijskog "
 "sustava, distribucije, a LiVES verzija ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "i sve podatke prikazane u nastavku:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "prikupljanja više infomacija.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Bilo koji"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nijedan"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "preporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "isključeno !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Zanemari promjene"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/hu.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2012-08-15 00:36+0000\n"
 "X-Generator: Launchpad (build 15801)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Köszönjük. A LiVES újraindításával helyreállítható a program.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Összeomlások bejelentésénél kérjük add meg a rendszered adatait és a LiVES "
 "verziószámát. ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "és minden lent szereplő információt:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "beiktatásával, hogy további információkat tudhass meg.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Bármely"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nincs"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "ajánlott"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "tíltva!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Beépített"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Egyéni"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Teszt"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Üres háttér"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/it.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Grazie. Dovrebbe essere possibile un recupero se riavvii LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Durante la segnalazione di crash, fornisci informazioni sul tuo sistema "
 "operativo, la distribuzione e la versione di LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "e qualsiasi altra informazione mostrata qua sotto:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "informazioni.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Qualsiasi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "consigliato"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "disabilitato !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Integrato"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "Sfondo _Vuoto"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/ja.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "してください。\n"
 "ご協力ありがとうございます。LiVESを再起動すれば復元が行われるでしょう。\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー"
 "ジョンなどの詳細も含めてください ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "また、以下の情報もお願いします:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "と共に実行してください。\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "推奨"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "使用不能！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "ビルトイン"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "カスタム"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "テスト"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "空白のバックグラウンド(_B)"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1828

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

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 2.4.1\n"
+"Project-Id-Version: lives 2.4.2\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -26,22 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -50,7 +50,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -58,96 +58,96 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr ""
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -159,112 +159,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/nl_NL.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: \n"
@@ -15,7 +15,7 @@
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -24,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -48,7 +48,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -56,97 +56,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "Vervagen"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -158,112 +158,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1828
+#: src/main.c:1832
 msgid "mplayer2...detected..."
 msgstr ""

LiVES-2.4.1.tar.bz2/po/oc.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-29 15:04+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -51,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,91 +67,91 @@
 "e tota autra informacion indicada çaijós :\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Requadratge"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Quin que siá"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Pas cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "desactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Integrat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personalizat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Testar"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Aviar"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -163,114 +163,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/pl.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Ostrzeżenie: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Błąd krytyczny: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu życia.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "oraz wszelkie informacje poniżej:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,84 +86,84 @@
 "więcej informacji.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Dowolny"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "zalecane"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Wbudowane"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Własne"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Przetestuj"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Uruchom"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/pms.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:01+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Avis: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Eror grav: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Eror vastant: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Mersì. A dovrìa podej arpijè sò travaj andiand torna LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -68,7 +68,7 @@
 "Cand a arpòrta d'vast, ch'a includa fabilman ij detaj ëd sò sistem operativ, "
 "la distribussion e la version ëd LiVES."
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +76,7 @@
 "e tute j'informassion smonùe sì dapress\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -86,83 +86,83 @@
 "fale (debug) për cheuje pì d'informassion.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservassion j'anpostassion\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Ardimensionament"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "qualsëssìa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Gnun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "consejà"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "dësativà"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**L'atual formà**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Antregà"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Personaj"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Prim pian"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Drefond"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Caria dle gionte për j'efet an temp-real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Andi dël jack audio server..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Andi dël jack transport server..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Conession al jack transport server..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,114 @@
 "\n"
 "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Andi dël pulse audio server..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Contròl dependense opsionaj:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...trovà..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEN TROVÀ"
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/pt.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -15,7 +15,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -24,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -53,7 +53,7 @@
 "group_id=64341&atid=5071 39\n"
 "Obrigado. A recuperação deve ser possível se você reiniciar LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -65,7 +65,7 @@
 "Quando falha de informação, por favor inclua detalhes de seu sistema "
 "operacional, a distribuição ea versão do LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -73,91 +73,91 @@
 "e todas as informações mostradas abaixo:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "desactivado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -169,114 +169,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/pt_BR.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -15,7 +15,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -24,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -53,7 +53,7 @@
 "group_id=64341&atid=507139\n"
 "Obrigado. Os dados podem ser recuperados se você reiniciar o LiVes.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -65,7 +65,7 @@
 "Ao reportar travamentos, por favor informe qual o seu sistema operacional, "
 "distribuição e a versão do LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -73,7 +73,7 @@
 "e toda informação mostrada abaixo:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -83,84 +83,84 @@
 "seja coletada mais informações.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "desativado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -172,114 +172,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/ro.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +57,7 @@
 "Mulţumesc. De recuperare ar trebui să fie posibilă în cazul în care "
 "reporniţi LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -69,7 +69,7 @@
 "Atunci când se blochează de raportare, vă rugăm să includă detalii cu "
 "privire la sistemul de operare, de distribuţie, precum şi LiVES versiunea ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +77,7 @@
 "şi orice alte informaţii prezentate mai jos:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +87,84 @@
 "multe informații.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Orice"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Nimic"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "dezactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Ignoră schimbările"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +176,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/ru.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
 "X-Generator: Launchpad (build 17474)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "Все переводчики должны прочитать заметки по переводу LiVES на\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Внимание: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Критическая ошибка: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Неисправимая ошибка: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -61,7 +61,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Спасибо. Для восстановления перезапустите LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -73,7 +73,7 @@
 "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, "
 "дистрибутиве, а также версию LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -81,7 +81,7 @@
 "и другую информацию, как указано ниже:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -91,83 +91,83 @@
 "чтобы собрать больше информации.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Любой"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "рекомендуемые"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "отключено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Встроенный"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Настраиваемый"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Тест"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Передний план"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Фон"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -188,114 +188,114 @@
 "Также, вы можете попробовать запустить программу таким образом \"lives -"
 "jackopts 16\" или "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/sk.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -61,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Ďakujeme. Obnovenie by malo byť možné po reštartovaní LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -73,7 +73,7 @@
 "Pri nahlasovaní neočakávaných skončení, prosím uveďte podrobnosti o "
 "operačnom systéme, distribúcii a verzii LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -81,7 +81,7 @@
 "a všetky informácie uvedené nižšie:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -91,84 +91,84 @@
 "zhromaždenie viac informácií.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Zmena veľkosti"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Žiaden"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "doporučené"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "zakázané !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Vstavané"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Vlastné"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Otestovať"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdne pozadie"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -180,114 +180,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/te.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +28,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -52,7 +52,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -60,97 +60,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "పరిమాణం మార్చుట"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "ఏదైనా"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "ఏదీ వద్దు"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "సిఫారసుచేయబడింది"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "నిర్మితమైన"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "మలచిన"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "పరిశీలన"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_ప్రారంభం"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -162,112 +162,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1828
+#: src/main.c:1832
 msgid "mplayer2...detected..."
 msgstr ""

LiVES-2.4.1.tar.bz2/po/tr.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +57,7 @@
 "Teşekkür ederiz. Eğer LiVES yeniden başlatırsanız çalışmanızı kurtarmanız "
 "mümkündür.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -69,7 +69,7 @@
 "Lütfen hata raporuna İşletim sistemi, dağıtım ve LiVES sürüm bilgilerini "
 "ekleyiniz ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +77,7 @@
 "ve daha fazla bilgi aşağıda gösterilmiştir:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +87,84 @@
 "birlikte çalıştırın.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:698
+#: src/main.c:702
 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:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Herhangi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Boş"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "tavsiye"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "Engelli!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Yapısal"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Özel"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Sınama"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "_Boş arkaplan"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +176,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/ug.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -51,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -59,97 +59,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "خالىغان"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "يوق"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "تەۋسىيە قىلغان"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "چەكلەنگەن!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "ئىچكى"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "ئىختىيارى"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "سىناق"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "باشلا(_S)"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -161,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1828
+#: src/main.c:1832
 msgid "mplayer2...detected..."
 msgstr ""

LiVES-2.4.1.tar.bz2/po/uk.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:12+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +33,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s, попередження: %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s, критична помилка: %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s, аварія: %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +62,7 @@
 "group_id=64341&atid=507139\n"
 "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -74,7 +74,7 @@
 "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої "
 "операційної системи, дистрибутива та номер версії LiVES ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +82,7 @@
 "а також дані, наведені нижче:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,83 +92,83 @@
 "зібрати більше даних.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Будь-який"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Жодного"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "найліпший"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "вимкнено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "Вбудований"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Нетиповий"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Перевірити"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr "Передній план"
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr "Тло"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -187,114 +187,114 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1828
+#: src/main.c:1832

LiVES-2.4.1.tar.bz2/po/uz.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +32,22 @@
 "Барча таржимонлар LiVES таржима эслатмасаларини \n"
 "http://lives.sourceforge.net/TRANS-README.txt файлидан ўқишлари керак."
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +62,7 @@
 "Раҳмат. Тиклаш жараёни LiVES. дастурини қайтадан ишга туширсангиз мавжуд "
 "бўлиши керак.\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -74,7 +74,7 @@
 "Носозлик ҳақида хабар берганингизда, илтимос, операцион тизимингиз, "
 "дистрибутивингиз ва LiVES дастури версияси маълумотларини ҳам қўшинг ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +82,7 @@
 "ва бошқа маълумот қуйида кўрсатилади:\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,84 +92,84 @@
 "debug мосламаси билан ишга туширинг.\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "Йиғилганларни сақлаш\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "Ҳажми ўзгартирилмоқда"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "Барча кадрларнинг _ҳажмини ўзгартириш"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "Исталган"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "Йўқ"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "тавсия қилинди"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "ўчирилди !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**Жорий қатлам**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "Бошқа"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "Синаш"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 #, fuzzy
 msgid "Background"
 msgstr "Сўниш"
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +181,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1828

LiVES-2.4.1.tar.bz2/po/zh_CN.po -> LiVES-2.4.2.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-08-09 14:52-0300\n"
+"POT-Creation-Date: 2015-09-12 19:29-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"
@@ -18,7 +18,7 @@
 "X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
 "X-Generator: Launchpad (build 17474)\n"
 
-#: src/main.c:128
+#: src/main.c:130
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:153
+#: src/main.c:155
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s 警告： %s\n"
 
-#: src/main.c:157
+#: src/main.c:159
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s 严重错误： %s\n"
 
-#: src/main.c:158
+#: src/main.c:160
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s 致命错误： %s\n"
 
-#: src/main.c:198
+#: src/main.c:200
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,7 +56,7 @@
 "谢。\n"
 "重启 LiVES 之后应该可以恢复。\n"
 
-#: src/main.c:199
+#: src/main.c:201
 msgid ""
 "\n"
 "\n"
@@ -67,7 +67,7 @@
 "\n"
 "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 ("
 
-#: src/main.c:203
+#: src/main.c:205
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -75,7 +75,7 @@
 "以及下面的信息：\n"
 "\n"
 
-#: src/main.c:206
+#: src/main.c:208
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -84,83 +84,83 @@
 "请安装 gdb 然后添加 -debug 选项运行 LiVES 以便收集更多信息。\n"
 "\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:691
+#: src/main.c:695
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:698
+#: src/main.c:702
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:948
+#: src/main.c:952
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:950
+#: src/main.c:954
 msgid "None"
 msgstr "无"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:952
+#: src/main.c:956
 msgid "recommended"
 msgstr "推荐"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:954
+#: src/main.c:958
 msgid "disabled !"
 msgstr "已禁用 ！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:956
+#: src/main.c:960
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:958
+#: src/main.c:962
 msgid "Builtin"
 msgstr "内置"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:960
+#: src/main.c:964
 msgid "Custom"
 msgstr "自定义"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:962
+#: src/main.c:966
 msgid "Test"
 msgstr "测试"
 
-#: src/main.c:1107
+#: src/main.c:1111
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1108
+#: src/main.c:1112
 msgid "Background"
 msgstr ""
 
-#: src/main.c:1624
+#: src/main.c:1628
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1690
+#: src/main.c:1694
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1692
+#: src/main.c:1696
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1693
+#: src/main.c:1697
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1723
+#: src/main.c:1727
 #, c-format
 msgid ""
 "\n"
@@ -179,114 +179,114 @@
 "\n"
 "除此之外，尝试用启动命令行“lives -jackopts 16\"或 "
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1825
+#: src/main.c:1829
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1826
+#: src/main.c:1830
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1827
+#: src/main.c:1831
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1828
+#: src/main.c:1832

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

@@ -23,7 +23,7 @@
 # Do not change these except for testing !
 
 $background=1;
-$version="2.4.1";
+$version="2.4.2";
 #$dyneversion="LIVES-20091209";
 
 ###################################################################
@@ -402,11 +402,12 @@
             &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");
 
+            &rc_set_if_not_set("show_button_icons","false");
+
             $tmpdir=&rc_get("tempdir");
             &write_bootstrap_file;
             &mktmpdir;
@@ -3075,6 +3076,23 @@
     }
 
 
+    if ($command eq "recover_audio") {
+        $audio_in="audiodump.pcm";
+
+
+        $audio_out="audio";
+        &convert_audio_to_raw;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+        unlink "$audio_in";
+
+
+    }
+
+
+
 
     if ($command eq "append_audio") {
 # here we end up with (raw) 'audiodump', which will be renamed to 'audio' in commit_audio
@@ -3433,6 +3451,12 @@
 
     if ($command eq "commit_audio") {
 # commit the audio file in either audiodump or audiodump.wav as new audio file
+
+        $allow_nonex=0;
+        if (defined $ARGV[2]) {
+            $allow_nonex=$ARGV[2];
+        }
+
         smog_chdir("$curtmpdir");
         $audio_out="audio";
         $audio_bak="audio.bak";
@@ -3502,7 +3526,9 @@
                 $arate=$achans=$asamps=0;
                 $signed=$endian=1;
             } else {
-                &sig_error("$GUI_NAME audio error.");
+                unless($allow_nonex) {
+                    &sig_error("$GUI_NAME audio error.");
+                }
             }
         }
         unlink glob "audiodump.*";

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

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

@@ -26,7 +26,6 @@
 #include "effects.h"
 #include "support.h"
 
-
 // keep first 16 audio_in filesysten handles open - multitrack only
 #define NSTOREDFDS 16
 static char *storedfnames[NSTOREDFDS];
@@ -82,7 +81,7 @@
     abuf->out_achans=channum;
   }
   channum--;
-  abuf->bufferf[channum]=(float *)lives_realloc(abuf->bufferf[channum],nsampsize);
+  abuf->bufferf[channum]=(float *)lives_realloc(abuf->bufferf[channum],nsampsize*sizeof(float));
   lives_memcpy(&abuf->bufferf[channum][abuf->samples_filled],src,nsamples*sizeof(float));
 }
 
@@ -107,7 +106,7 @@
     abuf->out_achans=channum;
   }
   channum--;
-  abuf->buffer16[channum]=(int16_t *)lives_realloc(abuf->buffer16[channum],nsampsize);
+  abuf->buffer16[channum]=(int16_t *)lives_realloc(abuf->buffer16[channum],nsampsize*2);
   lives_memcpy(&abuf->buffer16[channum][abuf->samples_filled],src,nsamples*2);
 #ifdef DEBUG_AFB
   g_print("append16 to afb\n");
@@ -442,7 +441,7 @@
 
 void sample_move_float_float(float *dst, float *src, uint64_t nsamples, float scale, int dst_skip) {
   // copy one channel of float to a buffer, applying the scale (scale 2.0 to double the rate, etc)
-  size_t offs=0;
+  volatile size_t offs=0;
   float offs_f=0.;
   register int i;
 
@@ -1686,7 +1685,10 @@
     pa_threaded_mainloop_unlock(mainw->pulsed_read->mloop);
 
     if (close_device) mainw->pulsed_read=NULL;
-    else mainw->pulsed_read->in_use=FALSE;
+    else {
+      mainw->pulsed_read->in_use=FALSE;
+      mainw->pulsed_read->playing_file=-1;
+    }
   }
 
   if (mainw->aud_rec_fd!=-1&&close_fd) {
@@ -2235,18 +2237,18 @@
       if (cbuffer->bufferf!=NULL) {
         // free float channels
         for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->bufferf[i]);
+          lives_free(cbuffer->bufferf[i]);
         }
-        free(cbuffer->bufferf);
+        lives_free(cbuffer->bufferf);
         cbuffer->bufferf=NULL;
       }
 
       if (cbuffer->buffer16!=NULL) {
         // free 16bit channels
         for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->buffer16[i]);
+          lives_free(cbuffer->buffer16[i]);
         }
-        free(cbuffer->buffer16);
+        lives_free(cbuffer->buffer16);
         cbuffer->buffer16=NULL;
       }
 
@@ -2268,9 +2270,9 @@
       if (cbuffer->bufferf!=NULL) {
         // free float channels
         for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->bufferf[i]);
+          lives_free(cbuffer->bufferf[i]);
         }
-        free(cbuffer->bufferf);
+        lives_free(cbuffer->bufferf);
         cbuffer->bufferf=NULL;
       }
 
@@ -2297,7 +2299,7 @@
         // free any excess channels
 
         for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->buffer16[i]);
+          lives_free(cbuffer->buffer16[i]);
         }
 
         if ((cbuffer->out_interleaf?1:cbuffer->out_achans) < (cbuffer->_cout_interleaf?1:cbuffer->_cachans)) {
@@ -2336,7 +2338,7 @@
         // free any excess channels
 
         for (i=(cbuffer->in_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cin_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->buffer16[i]);
+          lives_free(cbuffer->buffer16[i]);
         }
 
 
@@ -2372,7 +2374,7 @@
         // free any excess channels
 
         for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
-          free(cbuffer->bufferf[i]);
+          lives_free(cbuffer->bufferf[i]);
         }
 
 
@@ -2530,7 +2532,6 @@
 
 
 void audio_cache_end(void) {
-  // TODO - check why we are using free() here
 
   int i;
   lives_audio_buf_t *xcache_buffer;
@@ -2541,25 +2542,25 @@
   // free all buffers
 
   for (i=0; i<(cache_buffer->_cin_interleaf?1:cache_buffer->_cachans); i++) {
-    if (cache_buffer->buffer8!=NULL&&cache_buffer->buffer8[i]!=NULL) free(cache_buffer->buffer8[i]);
-    if (cache_buffer->buffer16!=NULL&&cache_buffer->buffer16[i]!=NULL) free(cache_buffer->buffer16[i]);
-    if (cache_buffer->buffer24!=NULL&&cache_buffer->buffer24[i]!=NULL) free(cache_buffer->buffer24[i]);
-    if (cache_buffer->buffer32!=NULL&&cache_buffer->buffer32[i]!=NULL) free(cache_buffer->buffer32[i]);
-    if (cache_buffer->bufferf!=NULL&&cache_buffer->bufferf[i]!=NULL) free(cache_buffer->bufferf[i]);
+    if (cache_buffer->buffer8!=NULL&&cache_buffer->buffer8[i]!=NULL) lives_free(cache_buffer->buffer8[i]);
+    if (cache_buffer->buffer16!=NULL&&cache_buffer->buffer16[i]!=NULL) lives_free(cache_buffer->buffer16[i]);
+    if (cache_buffer->buffer24!=NULL&&cache_buffer->buffer24[i]!=NULL) lives_free(cache_buffer->buffer24[i]);
+    if (cache_buffer->buffer32!=NULL&&cache_buffer->buffer32[i]!=NULL) lives_free(cache_buffer->buffer32[i]);
+    if (cache_buffer->bufferf!=NULL&&cache_buffer->bufferf[i]!=NULL) lives_free(cache_buffer->bufferf[i]);
   }
 
-  if (cache_buffer->buffer8!=NULL) free(cache_buffer->buffer8);
-  if (cache_buffer->buffer16!=NULL) free(cache_buffer->buffer16);
-  if (cache_buffer->buffer24!=NULL) free(cache_buffer->buffer24);
-  if (cache_buffer->buffer32!=NULL) free(cache_buffer->buffer32);
-  if (cache_buffer->bufferf!=NULL) free(cache_buffer->bufferf);
+  if (cache_buffer->buffer8!=NULL) lives_free(cache_buffer->buffer8);
+  if (cache_buffer->buffer16!=NULL) lives_free(cache_buffer->buffer16);
+  if (cache_buffer->buffer24!=NULL) lives_free(cache_buffer->buffer24);
+  if (cache_buffer->buffer32!=NULL) lives_free(cache_buffer->buffer32);
+  if (cache_buffer->bufferf!=NULL) lives_free(cache_buffer->bufferf);
 
-  if (cache_buffer->_filebuffer!=NULL) free(cache_buffer->_filebuffer);
+  if (cache_buffer->_filebuffer!=NULL) lives_free(cache_buffer->_filebuffer);
 
   // make this threadsafe
   xcache_buffer=cache_buffer;
   cache_buffer=NULL;
-  free(xcache_buffer);
+  lives_free(xcache_buffer);
 }
 
 
@@ -3031,11 +3032,8 @@
       }
       dst+=alen*sizeof(float);
     } else {
-      // interleaved
-      for (i=0; i<tchans; i++) {
-        sample_move_float_float((float *)dst,(float *)src,alen,scale,tchans);
-        dst+=sizeof(float);
-      }
+      sample_move_float_float((float *)dst,(float *)src,alen,scale,tchans);
+      dst+=sizeof(float);
     }
   }
   return TRUE;

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

@@ -4030,7 +4030,9 @@
 
       if (prefs->rec_opts&REC_EFFECTS) {
         // add deinit events for all active effects
+        pthread_mutex_unlock(&mainw->event_list_mutex);
         add_filter_deinit_events(mainw->event_list);
+        pthread_mutex_lock(&mainw->event_list_mutex);
       }
 
       // write a RECORD_END marker
@@ -4329,9 +4331,7 @@
 }
 
 
-void
-on_insertwsound_toggled(LiVESToggleButton *togglebutton,
-                        livespointer         user_data) {
+void on_insertwsound_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton))) {
     lives_widget_set_sensitive(insertw->fit_checkbutton,FALSE);
   } else {
@@ -4341,9 +4341,7 @@
 }
 
 
-void
-on_insfitaudio_toggled(LiVESToggleButton *togglebutton,
-                       livespointer         user_data) {
+void on_insfitaudio_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   mainw->fx1_bool=!mainw->fx1_bool;
 
   if (lives_toggle_button_get_active(togglebutton)) {
@@ -4441,7 +4439,7 @@
            i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
                mainw->blend_file:mainw->current_file));
 
-  switch_clip(type,i);
+  switch_clip(type,i,FALSE);
 
   return TRUE;
 }
@@ -4479,7 +4477,7 @@
            i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
                mainw->blend_file:mainw->current_file));
 
-  switch_clip(type,i);
+  switch_clip(type,i,FALSE);
 
   return TRUE;
 }
@@ -5572,9 +5570,12 @@
 }
 
 
-void switch_clip(int type, int newclip) {
+void switch_clip(int type, int newclip, boolean force) {
   // generic switch clip callback
 
+  // This is the new single entry function for switching clips.
+  // It should eventually replace switch_to_file() and do_quick_switch()
+
   // prev clip
   // type = 0 : if the effect is a transition, this will change the background clip
   // type = 1 fg only
@@ -5604,13 +5605,14 @@
 
   // switch fg clip
 
-  if (newclip==mainw->current_file) return;
+  if (!force&&(newclip==mainw->current_file&&(mainw->playing_file==-1||mainw->playing_file==newclip))) return;
   if (!cfile->is_loaded) mainw->cancelled=CANCEL_NO_PROPOGATE;
 
   if (mainw->playing_file>-1) {
     mainw->pre_src_file=newclip;
     mainw->new_clip=newclip;
   } else {
+    if (force&&newclip==mainw->current_file) mainw->current_file=0;
     switch_to_file(mainw->current_file,newclip);
   }
 }
@@ -5623,12 +5625,10 @@
   if (mainw->current_file<1||mainw->preview||(mainw->is_processing&&cfile->is_loaded)||mainw->cliplist==NULL) return;
 
   for (i=1; i<MAX_FILES; i++) {
-    if (!(mainw->files[i]==NULL)) {
+    if (mainw->files[i]!=NULL) {
       if (LIVES_MENU_ITEM(menuitem)==LIVES_MENU_ITEM(mainw->files[i]->menuentry)&&
           lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->files[i]->menuentry))) {
-        if (!(i==mainw->current_file)) {
-          switch_clip(0,i);
-        }
+        switch_clip(0,i,FALSE);
         return;
       }
     }
@@ -8526,7 +8526,7 @@
 
   add_warn_check(LIVES_BOX(vbox),WARN_MASK_LAYOUT_POPUP);
 
-  button = lives_button_new_with_mnemonic(_("Close _Window"));
+  button = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window"));
 
   lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), button, LIVES_RESPONSE_OK);
 
@@ -8537,7 +8537,7 @@
   lives_container_set_border_width(LIVES_CONTAINER(button), widget_opts.border_width);
   lives_widget_set_can_focus_and_default(button);
 
-  textwindow->clear_button = lives_button_new_with_mnemonic(_("Clear _Errors"));
+  textwindow->clear_button = lives_button_new_from_stock(LIVES_STOCK_CLEAR,_("Clear _Errors"));
 
   lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), textwindow->clear_button, LIVES_RESPONSE_CANCEL);
 
@@ -8548,7 +8548,7 @@
   lives_container_set_border_width(LIVES_CONTAINER(textwindow->clear_button), widget_opts.border_width);
   lives_widget_set_can_focus_and_default(textwindow->clear_button);
 
-  textwindow->delete_button = lives_button_new_with_mnemonic(_("_Delete affected layouts"));
+  textwindow->delete_button = lives_button_new_from_stock(LIVES_STOCK_DELETE,_("_Delete affected layouts"));
 
   lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), textwindow->delete_button, LIVES_RESPONSE_CANCEL);
 
@@ -9322,7 +9322,7 @@
       if (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use)
         lives_widget_hide(cfile->proc_ptr->stop_button);
 #endif
-      } else {
+    } else {
       mainw->timeout_ticks+=xticks;
       com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
       if (!mainw->preview) {
@@ -9345,17 +9345,17 @@
     if (!cfile->opening&&!mainw->internal_messaging
         && !(
 #ifdef ENABLE_JACK
-	     (mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
+          (mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
 #else
-	     0
+          0
 #endif
-	     ||
+          ||
 #ifdef HAVE_PULSE_AUDIO
-	     (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use)
+          (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use)
 #else
-	     0
+          0
 #endif
-	     )) {
+        )) {
       lives_system(com,FALSE);
     }
   }
@@ -10226,7 +10226,7 @@
   if (mainw->clipstore[clip]<1||mainw->files[mainw->clipstore[clip]]==NULL) {
     mainw->clipstore[clip]=mainw->current_file;
   } else {
-    switch_clip(0,mainw->clipstore[clip]);
+    switch_clip(0,mainw->clipstore[clip],FALSE);
   }
   return TRUE;
 }

LiVES-2.4.1.tar.bz2/src/ce_thumbs.c -> LiVES-2.4.2.tar.bz2/src/ce_thumbs.c Changed

LiVES-2.4.1.tar.bz2/src/colourspace.c -> LiVES-2.4.2.tar.bz2/src/colourspace.c Changed

@@ -1,6 +1,6 @@
 // colourspace.c
 // LiVES
-// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2015 <salsaman@gmail.com>
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -3755,7 +3755,7 @@
 }
 
 
-static void convert_yuv420_to_uyvy_frame(uint8_t **src, int width, int height, uyvy_macropixel *dest) {
+static void convert_yuv420_to_uyvy_frame(uint8_t **src, int width, int height, uyvy_macropixel *dest, boolean clamped) {
   register int i=0,j;
   uint8_t *y,*u,*v,*end;
   int hwidth=width>>1;
@@ -3770,6 +3770,8 @@
 
   end=y+width*height;
 
+  set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
+
   while (y<end) {
     for (j=0; j<hwidth; j++) {
       dest->u0=u[0];
@@ -3797,7 +3799,7 @@
 }
 
 
-static void convert_yuv420_to_yuyv_frame(uint8_t **src, int width, int height, yuyv_macropixel *dest) {
+static void convert_yuv420_to_yuyv_frame(uint8_t **src, int width, int height, yuyv_macropixel *dest, boolean clamped) {
   register int i=0,j;
   uint8_t *y,*u,*v,*end;
   int hwidth=width>>1;
@@ -3812,6 +3814,8 @@
 
   end=y+width*height;
 
+  set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
+
   while (y<end) {
     for (j=0; j<hwidth; j++) {
       dest->y0=y[0];
@@ -8149,10 +8153,6 @@
   // but we will convert to/from the 5 other RGB palettes and 10 YUV palettes
   // giving a total of 15*14=210 conversions
   //
-  // number coded so far 180
-  // ~85% complete
-
-  // some conversions to and from ARGB and to and from yuv411 are missing
 
   // NOTE - if converting to YUV411, we cut pixels so (RGB) width is divisible by 4
   //        if converting to other YUV, we cut pixels so (RGB) width is divisible by 2
@@ -8181,6 +8181,7 @@
   int isamtype,isubspace;
   boolean iclamped,contig=FALSE;
 
+  if (layer==NULL) return FALSE;
 
   inpl=weed_get_int_value(layer,"current_palette",&error);
 
@@ -9504,14 +9505,14 @@
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
-      convert_yuv420_to_uyvy_frame(gusrc_array,width,height,(uyvy_macropixel *)gudest);
+      convert_yuv420_to_uyvy_frame(gusrc_array,width,height,(uyvy_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
-      convert_yuv420_to_yuyv_frame(gusrc_array,width,height,(yuyv_macropixel *)gudest);
+      convert_yuv420_to_yuyv_frame(gusrc_array,width,height,(yuyv_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -10460,6 +10461,8 @@
     lives_free(orowstrides);
     lives_free(irowstrides);
 
+    lives_free(in_pixel_data);
+
     return TRUE;
   }
 #endif
@@ -11275,24 +11278,25 @@
   LiVESError *error=NULL;
   char oname[PATH_MAX];
   char nname[PATH_MAX];
-  char *com;
+  char *com,*tmp;
 
   register int i;
 
   blankp=lives_pixbuf_new_blank(sfile->hsize,sfile->vsize,WEED_PALETTE_RGB24);
 
   for (i=1; i<=sfile->frames; i++) {
-    lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+    tmp=make_image_file_name(sfile,i,get_image_ext_for_type(sfile->img_type));
+    lives_snprintf(oname,PATH_MAX,"%s",tmp);
+    lives_free(tmp);
     if (lives_file_test(oname,LIVES_FILE_TEST_EXISTS)) {
-      lives_snprintf(nname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+nframes,get_image_ext_for_type(sfile->img_type));
+      tmp=make_image_file_name(sfile,i+nframes,get_image_ext_for_type(sfile->img_type));
+      lives_snprintf(oname,PATH_MAX,"%s",tmp);
+      lives_free(tmp);
       mainw->com_failed=FALSE;
 #ifndef IS_MINGW
-      com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,
-                              oname,nname);
+      com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,oname,nname);
 #else
-      com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",
-                              oname,nname);
-
+      com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",oname,nname);
 #endif
       lives_system(com,FALSE);
       lives_free(com);
@@ -11304,7 +11308,9 @@
   }
 
   for (i=after; i<after+nframes; i++) {
-    lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+1,get_image_ext_for_type(sfile->img_type));
+    tmp=make_image_file_name(sfile,i+1,get_image_ext_for_type(sfile->img_type));
+    lives_snprintf(oname,PATH_MAX,"%s",tmp);
+    lives_free(tmp);
     lives_pixbuf_save(blankp, oname, sfile->img_type, 100-prefs->ocp, TRUE, &error);
     if (error!=NULL) {
       lives_error_free(error);

LiVES-2.4.1.tar.bz2/src/cvirtual.c -> LiVES-2.4.2.tar.bz2/src/cvirtual.c Changed

@@ -213,7 +213,7 @@
   for (i=0; i<sfile->frames; i++) {
     if (sfile->frame_index[i]==-1) {
       // this is a non-virtual frame
-      char *frame=lives_strdup_printf("%s/%s/%08d.png",prefs->tmpdir,sfile->handle,i+1);
+      char *frame=make_image_file_name(sfile,i+1,LIVES_FILE_EXT_PNG);
       if (lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) empirical_img_type=IMG_TYPE_PNG;
       else empirical_img_type=IMG_TYPE_JPEG;
       lives_free(frame);
@@ -336,7 +336,7 @@
       pixbuf=pull_lives_pixbuf_at_size(sfileno,i,get_image_ext_for_type(sfile->img_type),
                                        q_gint64((i-1.)/sfile->fps,sfile->fps),sfile->hsize,sfile->vsize,LIVES_INTERP_BEST);
 
-      oname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+      oname=make_image_file_name(sfile,i,get_image_ext_for_type(sfile->img_type));
 
       do {
         retval=0;
@@ -532,7 +532,7 @@
     threaded_dialog_spin();
 
     if ((i<sfile->frames&&sfile->frame_index[i]!=-1)||i>=sfile->frames) {
-      iname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+      iname=make_image_file_name(sfile,i,get_image_ext_for_type(sfile->img_type));
 
 #ifndef IS_MINGW
       com=lives_strdup_printf("%s -f \"%s\"",capable->rm_cmd,iname);

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

@@ -122,9 +122,7 @@
 
 
 static void add_clear_ds_button(LiVESDialog *dialog) {
-  LiVESWidget *button = lives_button_new_from_stock(LIVES_STOCK_CLEAR);
-
-  lives_button_set_label(LIVES_BUTTON(button),_("_Recover disk space"));
+  LiVESWidget *button = lives_button_new_from_stock(LIVES_STOCK_CLEAR,_("_Recover disk space"));
   if (mainw->tried_ds_recover) lives_widget_set_sensitive(button,FALSE);
 
   lives_signal_connect(LIVES_GUI_OBJECT(button), LIVES_WIDGET_CLICKED_SIGNAL,
@@ -181,7 +179,7 @@
     dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
                                       LIVES_MESSAGE_WARNING,LIVES_BUTTONS_NONE,NULL);
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Warning !"));
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
     lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
                          LIVES_GUI_CALLBACK(lives_general_button_clicked),
@@ -192,7 +190,7 @@
     dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
                                       LIVES_MESSAGE_ERROR,LIVES_BUTTONS_NONE,NULL);
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Error !"));
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
     lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
                          LIVES_GUI_CALLBACK(lives_general_button_clicked),
@@ -202,7 +200,7 @@
     dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
                                       LIVES_MESSAGE_INFO,LIVES_BUTTONS_NONE,NULL);
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Information"));
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
     lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
                          LIVES_GUI_CALLBACK(lives_general_button_clicked),
@@ -219,31 +217,29 @@
     }
 
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Warning !"));
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_CANCEL);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_CANCEL,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_OK,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
     break;
 
   case LIVES_DIALOG_YESNO:
     dialog = lives_message_dialog_new(transient,(LiVESDialogFlags)0,LIVES_MESSAGE_QUESTION,LIVES_BUTTONS_NONE,NULL);
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Question"));
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_NO);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_NO,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_NO);
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_YES);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_YES,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_YES);
     break;
 
   case LIVES_DIALOG_ABORT_CANCEL_RETRY:
     dialog = lives_message_dialog_new(transient,(LiVESDialogFlags)0,LIVES_MESSAGE_ERROR,LIVES_BUTTONS_NONE,NULL);
     lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - File Error"));
-    abortbutton = lives_button_new_from_stock(LIVES_STOCK_QUIT);
-    lives_button_set_label(LIVES_BUTTON(abortbutton),_("_Abort"));
+    abortbutton = lives_button_new_from_stock(LIVES_STOCK_QUIT,_("_Abort"));
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), abortbutton, LIVES_RESPONSE_ABORT);
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
-    lives_button_set_label(LIVES_BUTTON(okbutton),_("_Retry"));
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH,_("_Retry"));
     lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_RETRY);
     break;
 
@@ -1794,10 +1790,18 @@
     // we got a message from the backend...
 
     if (visible&&(!accelerators_swapped||cfile->opening)&&cancellable&&(!cfile->nopreview||cfile->keep_without_preview)) {
-      if (!cfile->nopreview&&!(cfile->opening&&mainw->multitrack!=NULL))
+      if (!cfile->nopreview&&!(cfile->opening&&mainw->multitrack!=NULL)) {
         lives_widget_show(cfile->proc_ptr->preview_button);
-      if (cfile->opening_loc) lives_widget_show(cfile->proc_ptr->stop_button);
-      else lives_widget_show(cfile->proc_ptr->pause_button);
+      }
+
+      // show buttons
+      if (cfile->opening_loc) {
+        lives_widget_hide(cfile->proc_ptr->pause_button);
+        lives_widget_show(cfile->proc_ptr->stop_button);
+      } else {
+        lives_widget_show(cfile->proc_ptr->pause_button);
+        lives_widget_hide(cfile->proc_ptr->stop_button);
+      }
 
       if (!cfile->opening&&!cfile->nopreview) {
         lives_widget_grab_default(cfile->proc_ptr->preview_button);
@@ -1969,6 +1973,8 @@
     clear_mainw_msg();
     alarm_handle=lives_alarm_set(MIN_FLASH_TIME); // don't want to flash too fast...
   } else if (type==1) {
+
+    // show buttons
     lives_widget_show(proc_ptr->stop_button);
     lives_widget_show(proc_ptr->cancel_button);
 #ifdef HAVE_PULSE_AUDIO
@@ -2656,7 +2662,7 @@
   lives_box_pack_start(LIVES_BOX(vbox), procw->label3, FALSE, FALSE, 0);
 
   if (has_cancel) {
-    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
     lives_widget_show(cancelbutton);
 
     if (mainw->current_file>-1&&cfile!=NULL&&cfile->opening_only_audio) {
@@ -2737,6 +2743,8 @@
 
   char *copy_text;
 
+  if (!prefs->show_gui) return;
+
   if (mainw->threaded_dialog) return;
 
   copy_text=lives_strdup(trans_text);
@@ -2777,7 +2785,7 @@
   mainw->cancel_type=CANCEL_KILL;
   mainw->threaded_dialog=FALSE;
 
-  if (mainw->is_ready) 
+  if (mainw->is_ready)
     lives_widget_context_update();
 }

LiVES-2.4.1.tar.bz2/src/effects-data.c -> LiVES-2.4.2.tar.bz2/src/effects-data.c Changed

@@ -4038,7 +4038,7 @@
   lives_box_pack_start(LIVES_BOX(hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
-  conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD);
+  conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD,NULL);
   lives_widget_set_tooltip_text(conxwp->add_button[idx],_("Add another connection for this output parameter"));
 
 
@@ -4051,7 +4051,7 @@
                        (livespointer)conxwp);
 
 
-  conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE);
+  conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE,NULL);
   lives_widget_set_tooltip_text(conxwp->del_button[idx],_("Delete this connection"));
 
   hbox=lives_hbox_new(FALSE, 0);
@@ -4087,7 +4087,7 @@
   lives_box_pack_start(LIVES_BOX(hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
-  conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD);
+  conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD,NULL);
   lives_widget_set_tooltip_text(conxwp->add_button[idx],_("Add another connection for this output channel"));
 
 
@@ -4100,7 +4100,7 @@
                        (livespointer)conxwp);
 
 
-  conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE);
+  conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE,NULL);
   lives_widget_set_tooltip_text(conxwp->del_button[idx],_("Delete this connection"));
 
   hbox=lives_hbox_new(FALSE, 0);
@@ -4780,10 +4780,10 @@
     if (cconx_get_nconns(conxw.cconx,0)>0) lives_widget_set_sensitive(conxw.acbutton,TRUE);
   }
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), okbutton, LIVES_RESPONSE_OK);
 
   lives_widget_set_can_focus_and_default(okbutton);

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

@@ -982,6 +982,8 @@
 weed_plant_t *add_filter_deinit_events(weed_plant_t *event_list) {
   // during rendering we use the "keys" FX_KEYS_MAX_VIRTUAL -> FX_KEYS_MAX
   // here we add effect_deinit events to an event_list
+
+  // should be called with mainw->event_list_mutex unlocked !
   int i;
   boolean needs_filter_map=FALSE;
   weed_timecode_t last_tc=0;
@@ -999,7 +1001,11 @@
   // add an empty filter_map event (in case more frames are added)
   create_filter_map(mainw->rte); // we create filter_map event_t * array with ordered effects
 
-  if (needs_filter_map) event_list=append_filter_map_event(mainw->event_list,last_tc,filter_map);
+  if (needs_filter_map) {
+    pthread_mutex_lock(&mainw->event_list_mutex);
+    event_list=append_filter_map_event(mainw->event_list,last_tc,filter_map);
+    pthread_mutex_unlock(&mainw->event_list_mutex);
+  }
   return event_list;
 }
 
@@ -1457,7 +1463,10 @@
     if (rte_key_valid(i+1,TRUE)) {
       if (mainw->rte&(GU641<<i)) {
         mainw->osc_block=TRUE;
-        if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+        if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
+          mainw->osc_block=FALSE;
+          continue;
+        }
         last_inst=instance;
 
         // ignore video generators
@@ -1727,6 +1736,14 @@
 
   if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
 
+  if (is_pure_audio(filter,TRUE)) {
+    // moved this up, as the next stanza was running beat_detector without setting "audio_data"
+    //lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
+    return FILTER_ERROR_IS_AUDIO; // we process audio effects elsewhere
+  }
+
+
   // here, in_tracks and out_tracks map our layers to in_channels and out_channels in the filter
   if (!has_video_chans_in(filter,TRUE)||!weed_plant_has_leaf(inst,"in_channels")||
       (in_channels=weed_get_plantptr_array(inst,"in_channels",&error))==NULL) {
@@ -1738,13 +1755,13 @@
       // run it only if it outputs into effects which have video chans
       //if (!feeds_to_video_filters(key,rte_key_getmode(key+1))) return FILTER_ERROR_NO_IN_CHANNELS;
 
-      // data processing effect; just call the process_func
-      weed_set_double_value(inst,"fps",cfile->pb_fps);
-
       // see if we can multithread
       if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 &&
           filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
         filter_mutex_lock(key);
+        // data processing effect; just call the process_func
+        if (mainw->current_file>-1)
+          weed_set_double_value(inst,"fps",cfile->pb_fps);
         retval=process_func_threaded(inst,out_channels,tc);
         filter_mutex_unlock(key);
         if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
@@ -1755,6 +1772,8 @@
         weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
         process_func=process_func_ptr_ptr[0];
         filter_mutex_lock(key);
+        if (mainw->current_file>-1)
+          weed_set_double_value(inst,"fps",cfile->pb_fps);
         ret=(*process_func)(inst,tc);
         filter_mutex_unlock(key);
         if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
@@ -1782,12 +1801,6 @@
     return FILTER_ERROR_NO_IN_CHANNELS;
   }
 
-  if (is_pure_audio(filter,TRUE)) {
-    lives_free(in_channels);
-    if (out_channels!=NULL) lives_free(out_channels);
-    return FILTER_ERROR_IS_AUDIO; // we process audio effects elsewhere
-  }
-
   if (init_event==NULL) {
     num_in_tracks=enabled_in_channels(inst,FALSE);
     in_tracks=(int *)lives_malloc(2*sizint);
@@ -2081,8 +2094,7 @@
 
     set_channel_size(channel,incwidth,incheight,0,NULL);
 
-    palette=weed_get_int_value(layer,"current_palette",&error);
-    inpalette=cpalette;
+    inpalette=palette=weed_get_int_value(layer,"current_palette",&error);
 
     // check if we need to resize
     if ((inwidth!=width)||(inheight!=height)) {
@@ -2106,7 +2118,7 @@
         }
       }
       // check palette again in case it changed during resize
-      inpalette=weed_get_int_value(channel,"current_palette",&error);
+      inpalette=weed_get_int_value(layer,"current_palette",&error);
 
       inwidth=weed_get_int_value(layer,"width",&error)*weed_palette_get_pixels_per_macropixel(inpalette)/
               weed_palette_get_pixels_per_macropixel(palette);
@@ -2124,7 +2136,6 @@
 
     i++;
 
-
     // try to match palettes with first enabled in channel:
     // TODO ** - we should see which palette causes the least palette conversions
     if (i>0&&!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY))
@@ -2283,7 +2294,6 @@
     }
 
 
-
     if (cpalette!=inpalette||isubspace!=osubspace) {
 
       if (all_outs_alpha&&(weed_palette_is_lower_quality(inpalette,cpalette)||
@@ -2296,6 +2306,7 @@
         layer=weed_layer_copy(NULL,orig_layer);
       }
 
+
       if (!convert_layer_palette_full(layer,inpalette,
                                       osampling,oclamping,osubspace)) {
         lives_free(in_tracks);
@@ -2614,7 +2625,8 @@
     }
   }
 
-  weed_set_double_value(inst,"fps",cfile->pb_fps);
+  if (mainw->current_file>-1)
+    weed_set_double_value(inst,"fps",cfile->pb_fps);
 
   //...finally we are ready to apply the filter
 
@@ -2813,8 +2825,9 @@
       // run it only if it outputs into effects which have audio chans
       if (!feeds_to_audio_filters(key,rte_key_getmode(key+1))) return FILTER_ERROR_NO_IN_CHANNELS;
 
-      // data processing effect; just call the process_func
-      weed_set_double_value(inst,"fps",cfile->pb_fps);
+      if (mainw->current_file>-1)
+        // data processing effect; just call the process_func
+        weed_set_double_value(inst,"fps",cfile->pb_fps);
 
       // see if we can multithread
       if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 &&
@@ -3011,7 +3024,8 @@
     }
   }
 
-  weed_set_double_value(inst,"fps",cfile->pb_fps);
+  if (mainw->current_file>-1)
+    weed_set_double_value(inst,"fps",cfile->pb_fps);
 
   //...finally we are ready to apply the filter
   pthread_mutex_lock(&mainw->interp_mutex); // stop video thread from possibly interpolating our audio effects
@@ -3376,6 +3390,7 @@
     layers[i]=NULL;
   }
 
+
   retval2=weed_apply_audio_instance_inner(instance,init_event,layers,tc,nbtracks);
   if (retval==FILTER_NO_ERROR) retval=retval2;
 
@@ -3603,7 +3618,10 @@
         }
         if (mainw->rte&(GU641<<i)) {
           mainw->osc_block=TRUE;
-          if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+          if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
+            mainw->osc_block=FALSE;
+            continue;
+          }
           if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
             interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
           }
@@ -3635,6 +3653,7 @@
             }
           }
 
+
           filter_error=weed_apply_instance(instance,NULL,layers,opwidth,opheight,tc);
 
           if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
@@ -3777,21 +3796,26 @@
         mainw->osc_block=TRUE;
 
         // filter must not be deinited until we have processed it
-        if (pthread_mutex_trylock(&mainw->data_mutex[i])) continue;
-
+        if (pthread_mutex_trylock(&mainw->data_mutex[i])) {
+          mainw->osc_block=FALSE;
+          continue;

LiVES-2.4.1.tar.bz2/src/effects-weed.h -> LiVES-2.4.2.tar.bz2/src/effects-weed.h Changed

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

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

@@ -2186,7 +2186,7 @@
                        LIVES_GUI_CALLBACK(set_render_choice),
                        LIVES_INT_TO_POINTER(RENDER_CHOICE_EVENT_LIST));
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_widget_set_can_focus(cancelbutton,TRUE);
 
   lives_dialog_add_action_widget(LIVES_DIALOG(e_rec_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
@@ -2201,7 +2201,7 @@
 
   lives_window_add_accel_group(LIVES_WINDOW(e_rec_dialog), accel_group);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_widget_show(okbutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(e_rec_dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
@@ -3363,7 +3363,7 @@
 
   char *blabel=NULL;
   char *nlabel;
-  char *key_string,*com;
+  char *key_string,*com,*tmp;
   char *filter_name;
 
   if (reset) {
@@ -3692,16 +3692,21 @@
           if (next_tc<next_out_tc||next_tc-next_out_tc<next_out_tc-tc) break;
         } else if (next_out_tc>tc) break;
 
-        // TODO - dirsep
-
-        if (cfile->old_frames>0) lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,out_frame);
+        if (cfile->old_frames>0) {
+          tmp=make_image_file_name(cfile,out_frame,LIVES_FILE_EXT_MGK);
+          lives_snprintf(oname,PATH_MAX,"%s",tmp);
+          lives_free(tmp);
+        }
         // sig_progress...
         lives_snprintf(mainw->msg,256,"%d",progress++);
 
         if (prefs->ocp==-1) prefs->ocp=get_int_pref("open_compression_percent");
 
-        if (cfile->old_frames==0) lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,
-              out_frame,get_image_ext_for_type(cfile->img_type));
+        if (cfile->old_frames==0) {
+          tmp=make_image_file_name(cfile,out_frame,get_image_ext_for_type(cfile->img_type));
+          lives_snprintf(oname,PATH_MAX,"%s",tmp);
+          lives_free(tmp);
+        }
 
         do {
           retval=0;
@@ -4992,7 +4997,8 @@
 
   lives_button_box_set_layout(LIVES_BUTTON_BOX(hbuttonbox), LIVES_BUTTONBOX_SPREAD);
 
-  ok_button = lives_button_new_with_mnemonic(_("Close _window"));
+  ok_button = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window"));
+
   lives_widget_show(ok_button);
   lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
 
@@ -5399,7 +5405,7 @@
   add_fill_to_box(LIVES_BOX(daa));
 
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   if (!(prefs->startup_interface==STARTUP_MT&&!mainw->is_ready)) {
     lives_dialog_add_action_widget(LIVES_DIALOG(rdet->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
@@ -5412,11 +5418,10 @@
 
 
   if (!specified) {
-    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
     lives_button_box_set_button_width(LIVES_BUTTON_BOX(daa), rdet->okbutton, DEF_BUTTON_WIDTH*2);
   } else  {
-    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
-    lives_button_set_label(LIVES_BUTTON(rdet->okbutton),_("_Next"));
+    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD,_("_Next"));
   }
 
   lives_dialog_add_action_widget(LIVES_DIALOG(rdet->dialog), rdet->okbutton, LIVES_RESPONSE_OK);

LiVES-2.4.1.tar.bz2/src/framedraw.c -> LiVES-2.4.2.tar.bz2/src/framedraw.c Changed

@@ -163,7 +163,7 @@
 
   framedraw_add_label(box);
 
-  mainw->framedraw_reset = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+  mainw->framedraw_reset = lives_button_new_from_stock(LIVES_STOCK_REFRESH,NULL);
   hbox_rst = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(box), hbox_rst, FALSE, FALSE, 0);
 
@@ -272,9 +272,7 @@
   lives_scale_set_draw_value(LIVES_SCALE(mainw->framedraw_scale),FALSE);
 
   rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(lives_widget_get_toplevel(LIVES_WIDGET(box))),"rfx");
-  mainw->framedraw_preview = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
-  lives_button_set_label(LIVES_BUTTON(mainw->framedraw_preview),_("_Preview"));
-  lives_button_set_use_underline(LIVES_BUTTON(mainw->framedraw_preview), TRUE);
+  mainw->framedraw_preview = lives_button_new_from_stock(LIVES_STOCK_REFRESH,_("_Preview"));
   lives_box_pack_start(LIVES_BOX(hbox), mainw->framedraw_preview, TRUE, FALSE, 0);
   lives_widget_set_sensitive(mainw->framedraw_spinbutton,FALSE);
   lives_widget_set_sensitive(mainw->framedraw_scale,FALSE);
@@ -602,7 +600,7 @@
   }
 
   if (rfx->num_in_channels>0) {
-    img_ext="pre";
+    img_ext=LIVES_FILE_EXT_PRE;
   } else {
     img_ext=get_image_ext_for_type(cfile->img_type);
   }

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

@@ -292,7 +292,7 @@
   lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mainw->LiVES),FALSE);
 
 
-  if (prefs->present)
+  if (prefs->present&&prefs->show_gui)
     lives_window_present(LIVES_WINDOW(mainw->LiVES));
 
 #ifdef GUI_GTK
@@ -748,7 +748,7 @@
   lives_widget_set_sensitive(mainw->xdelete, FALSE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock("gtk-delete", LIVES_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock(LIVES_STOCK_DELETE, LIVES_ICON_SIZE_MENU);
   lives_widget_show(image);
   lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->xdelete), image);
 #endif
@@ -1848,6 +1848,18 @@
 
   lives_container_add(LIVES_CONTAINER(mainw->vol_toolitem),mainw->volume_scale);
   if (capable->smog_version_correct) {
+#ifdef GUI_GTK
+    register int i;
+    for (i=0; i<4; i++) {
+      GtkToolItem *spacer;
+      spacer=gtk_separator_tool_item_new();
+      lives_widget_show(LIVES_WIDGET(spacer));
+      gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(spacer),FALSE);
+      gtk_tool_item_set_homogeneous(LIVES_TOOL_ITEM(spacer),FALSE);
+      gtk_tool_item_set_expand(LIVES_TOOL_ITEM(spacer),TRUE);
+      lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(spacer),-1);
+    }
+#endif
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->vol_toolitem),-1);
   }
   lives_widget_set_tooltip_text(mainw->vol_toolitem,_("Audio volume (1.00)"));
@@ -3394,7 +3406,7 @@
   lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
-  if (stop_closure!=NULL) {
+  if (stop_closure!=NULL&&prefs->show_gui) {
     lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), stop_closure);
     lives_widget_add_accelerator(mainw->stop, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
                                  LIVES_KEY_q, (LiVESXModifierType)0,
@@ -3921,9 +3933,11 @@
     lives_widget_set_bg_color(mainw->play_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  // show the window (so we can hide its cursor !), and get its xwin
-  if (!(mainw->fs&&mainw->playing_file>-1&&mainw->vpp!=NULL)) {
-    lives_widget_show(mainw->play_window);
+  if (prefs->show_playwin) {
+    // show the window (so we can hide its cursor !), and get its xwin
+    if (!(mainw->fs&&mainw->playing_file>-1&&mainw->vpp!=NULL)) {
+      lives_widget_show(mainw->play_window);
+    }
   }
 
   resize_play_window();
@@ -4069,7 +4083,9 @@
 
     if (mainw->fs) {
       if (!lives_widget_is_visible(mainw->play_window)) {
-        lives_widget_show(mainw->play_window);
+        if (prefs->show_playwin) {
+          lives_widget_show(mainw->play_window);
+        }
         // be careful, the user could switch out of sepwin here !
         mainw->noswitch=TRUE;
         lives_widget_context_update();
@@ -4175,8 +4191,10 @@
         if (pmonitor!=0) {
           fullscreen=FALSE;
           if (mainw->play_window!=NULL) {
-            xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
-            if (xwinid==-1) return;
+            if (prefs->show_playwin) {
+              xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
+              if (xwinid==-1) return;
+            } else xwinid=-1;
           }
         }
         if (mainw->ext_playback) {
@@ -4259,8 +4277,10 @@
         lives_window_move(LIVES_WINDOW(mainw->play_window), xcen, ycen);
       }
     }
-    lives_window_present(LIVES_WINDOW(mainw->play_window));
-    lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+    if (prefs->show_playwin) {
+      lives_window_present(LIVES_WINDOW(mainw->play_window));
+      lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+    }
   } else {
     // not playing
     if (mainw->fs&&mainw->playing_file==-2&&mainw->sep_win&&prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
@@ -4369,10 +4389,15 @@
   // TODO - indicate "opening"
   char *tmp;
 
+#ifndef GTK_RADIO_MENU_BUG
   cfile->menuentry = lives_radio_menu_item_new_with_label(mainw->clips_group, tmp=get_menu_name(cfile));
-  lives_free(tmp);
-
   mainw->clips_group=lives_radio_menu_item_get_group(LIVES_RADIO_MENU_ITEM(cfile->menuentry));
+#else
+  cfile->menuentry = lives_check_menu_item_new_with_label(tmp=get_menu_name(cfile));
+  lives_check_menu_item_set_draw_as_radio(LIVES_CHECK_MENU_ITEM(cfile->menuentry),TRUE);
+#endif
+
+  lives_free(tmp);
 
   lives_widget_show(cfile->menuentry);
   lives_container_add(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry);
@@ -4394,8 +4419,10 @@
 
 
 void remove_from_clipmenu(void) {
+#ifndef GTK_RADIO_MENU_BUG
   LiVESList *list;
   int fileno;
+#endif
 
   lives_container_remove(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry);
   if (LIVES_IS_WIDGET(cfile->menuentry))
@@ -4408,8 +4435,11 @@
     if (prefs->crash_recovery) rewrite_recovery_file();
   }
 
+
+#ifndef GTK_RADIO_MENU_BUG
   list=mainw->cliplist;
   mainw->clips_group=NULL;
+
   while (list!=NULL) {
     fileno=LIVES_POINTER_TO_INT(list->data);
     if (mainw->files[fileno]!=NULL&&mainw->files[fileno]->menuentry!=NULL) {
@@ -4417,6 +4447,7 @@
       break;
     }
   }
+#endif
 
 }

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

@@ -225,6 +225,7 @@
     boolean woat=widget_opts.apply_theme;
     widget_opts.apply_theme=FALSE;
     procw->scrolledwindow = lives_standard_scrolled_window_new(ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(mainw->optextview));
+    lives_widget_set_size_request(procw->scrolledwindow, ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V);
     widget_opts.apply_theme=woat;
 
     details_arrow=lives_standard_expander_new(_("Show Details"),FALSE,LIVES_BOX(vbox3),procw->scrolledwindow);
@@ -239,7 +240,7 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(procw->processing));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  procw->stop_button = lives_button_new_with_mnemonic(_("_Enough"));
+  procw->stop_button = lives_button_new_with_mnemonic(_("_Enough")); // used only for open location and for audio recording
   procw->preview_button = lives_button_new_with_mnemonic(_("_Preview"));
 
   if (cfile->nokeep) procw->pause_button = lives_button_new_with_mnemonic(_("Paus_e"));
@@ -264,6 +265,8 @@
 #endif
        ) {
       // the "enough" button for opening
+
+      // show buttons
       lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), procw->stop_button, 0);
       lives_widget_show(procw->stop_button);
       lives_widget_set_can_focus_and_default(procw->stop_button);
@@ -552,7 +555,7 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(filew->dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_SPREAD);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(filew->dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
@@ -671,8 +674,8 @@
   if (text2!=NULL) {
     label = lives_standard_label_new(text2);
     lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   } else {
     cancelbutton = lives_button_new_with_mnemonic(_("Keep _my settings"));
     okbutton = lives_button_new_with_mnemonic(_("Use _recommended settings"));
@@ -763,12 +766,15 @@
   }
 
   if (mytext!=NULL||mainw->iochan!=NULL) {
+    LiVESWidget *savebutton;
+
     dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(textwindow->dialog));
     lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-    okbutton = lives_button_new_with_mnemonic(_("_Close Window"));
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window"));
+
+    savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE,_("_Save to file"));
 
-    LiVESWidget *savebutton = lives_button_new_with_mnemonic(_("_Save to file"));
     lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), savebutton, LIVES_RESPONSE_YES);
     lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), okbutton, LIVES_RESPONSE_OK);
 
@@ -925,10 +931,10 @@
 
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(insertw->insert_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(insertw->insert_dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
@@ -1037,10 +1043,10 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(opensel_dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(opensel_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(opensel_dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
@@ -1186,12 +1192,12 @@
   lives_widget_show(dialog_action_area);
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_widget_show(cancelbutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(locw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
   lives_widget_set_can_focus_and_default(cancelbutton);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_widget_show(okbutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(locw->dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
@@ -1383,7 +1389,7 @@
 
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
 
   if (!(type==4&&!mainw->interactive)) {
     lives_dialog_add_action_widget(LIVES_DIALOG(renamew->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
@@ -1394,9 +1400,8 @@
   }
 
   if (type==6) {
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
-    lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
-  } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD,_("_Next"));
+  } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
 
   lives_dialog_add_action_widget(LIVES_DIALOG(renamew->dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
@@ -1472,7 +1477,10 @@
 LiVESWidget *create_combo_dialog(int type, livespointer user_data) {
   // create a dialog with combo box selector
 
-  // type 1 == 1 combo box
+  // type 1 == unicap device
+
+  // afterwards, mainw->fx1_val points to index selected
+
 
   LiVESWidget *combo_dialog;
   LiVESWidget *dialog_vbox;
@@ -1706,7 +1714,7 @@
 
     add_fill_to_box(LIVES_BOX(hbox));
 
-    tvcardw->advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+    tvcardw->advbutton = lives_button_new_from_stock(LIVES_STOCK_PREFERENCES,_("_Advanced"));
 
     lives_box_pack_start(LIVES_BOX(hbox), tvcardw->advbutton, TRUE, TRUE, widget_opts.packing_width*4);
 
@@ -1787,10 +1795,10 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(cd_dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(cd_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(cd_dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -2460,12 +2468,12 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(cdsw->dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(cdsw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
   lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
                                LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  discardbutton = lives_button_new_from_stock(LIVES_STOCK_DELETE);
+  discardbutton = lives_button_new_from_stock(LIVES_STOCK_DELETE,NULL);
 
   lives_dialog_add_action_widget(LIVES_DIALOG(cdsw->dialog), discardbutton, 1+(type==2));
   lives_button_set_use_underline(LIVES_BUTTON(discardbutton),TRUE);
@@ -2475,8 +2483,8 @@
   else if (type==1) lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Delete clip set"));
   else if (type==2) lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Delete layout"));
 
-  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE);
-  lives_button_set_use_underline(LIVES_BUTTON(savebutton),TRUE);
+  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE,NULL);
+
   if (type==0||type==3) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Save layout"));
   else if (type==1) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Save clip set"));
   else if (type==2) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Wipe layout"));
@@ -2581,16 +2589,14 @@
                              LIVES_GUI_CALLBACK(flip_cdisk_bit),
                              LIVES_INT_TO_POINTER(LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
 
-  resetbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+  resetbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH,_("_Reset to Defaults"));
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), resetbutton, LIVES_RESPONSE_RETRY);
-  lives_button_set_label(LIVES_BUTTON(resetbutton),_("_Reset to Defaults"));
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
 
   lives_widget_set_can_focus_and_default(okbutton);

LiVES-2.4.1.tar.bz2/src/jack.c -> LiVES-2.4.2.tar.bz2/src/jack.c Changed

@@ -360,18 +360,18 @@
       // assign local copy from cache_buffers
       if (mainw->playing_file==-1 || (cache_buffer = pop_cache_buffer())==NULL || !cache_buffer->is_ready) {
         // audio buffer is not ready yet
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           pthread_mutex_lock(&mainw->abuf_frame_mutex);
         }
         for (i = 0; i < jackd->num_output_channels; i++) {
           if (!jackd->is_silent) {
             sample_silence_dS(out_buffer[i], nframes);
           }
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
           }
         }
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           mainw->audio_frame_buffer->samples_filled+=nframes;
           pthread_mutex_unlock(&mainw->abuf_frame_mutex);
         }
@@ -416,16 +416,16 @@
 
       /* output silence if nothing is being outputted */
       if (!jackd->is_silent) {
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           pthread_mutex_lock(&mainw->abuf_frame_mutex);
         }
         for (i = 0; i < jackd->num_output_channels; i++) {
           sample_silence_dS(out_buffer[i], nframes);
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
           }
         }
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           mainw->audio_frame_buffer->samples_filled+=nframes;
           pthread_mutex_unlock(&mainw->abuf_frame_mutex);
         }
@@ -513,16 +513,16 @@
             if (!wait_cache_buffer&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL))
               push_cache_buffer(cache_buffer, jackd, in_bytes, nframes, shrink_factor);
 
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               pthread_mutex_lock(&mainw->abuf_frame_mutex);
             }
             for (i = 0; i < jackd->num_output_channels; i++) {
               sample_silence_dS(out_buffer[i], nframes);
-              if (mainw->audio_frame_buffer!=NULL) {
+              if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                 append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
               }
             }
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               mainw->audio_frame_buffer->samples_filled+=nframes;
               pthread_mutex_unlock(&mainw->abuf_frame_mutex);
             }
@@ -579,16 +579,16 @@
         if (!jackd->in_use||in_bytes==0) {
           // reached end of audio with no looping
 
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             pthread_mutex_lock(&mainw->abuf_frame_mutex);
           }
           for (i = 0; i < jackd->num_output_channels; i++) {
             sample_silence_dS(out_buffer[i], nframes);
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
             }
           }
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             mainw->audio_frame_buffer->samples_filled+=nframes;
             pthread_mutex_unlock(&mainw->abuf_frame_mutex);
           }
@@ -657,30 +657,30 @@
 
               for (i=0; i<jackd->num_output_channels; i++) {
                 if (pl_error) {
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     pthread_mutex_lock(&mainw->abuf_frame_mutex);
                   }
                   for (i = 0; i < jackd->num_output_channels; i++) {
                     sample_silence_dS(out_buffer[i], numFramesToWrite);
-                    if (mainw->audio_frame_buffer!=NULL) {
+                    if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                       append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
                     }
                   }
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
                     pthread_mutex_unlock(&mainw->abuf_frame_mutex);
                   }
                 } else {
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     pthread_mutex_lock(&mainw->abuf_frame_mutex);
                   }
                   for (i = 0; i < jackd->num_output_channels; i++) {
                     lives_memcpy(out_buffer[i],fbuffer+(i*numFramesToWrite),numFramesToWrite*sizeof(float));
-                    if (mainw->audio_frame_buffer!=NULL) {
+                    if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                       append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
                     }
                   }
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     mainw->audio_frame_buffer->samples_filled+=nframes;
                     pthread_mutex_unlock(&mainw->abuf_frame_mutex);
                   }
@@ -787,16 +787,16 @@
             if (fbuffer!=NULL) lives_free(fbuffer);
 
           } else {
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               pthread_mutex_lock(&mainw->abuf_frame_mutex);
             }
             for (i = 0; i < jackd->num_output_channels; i++) {
               sample_silence_dS(out_buffer[i], numFramesToWrite);
-              if (mainw->audio_frame_buffer!=NULL) {
+              if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                 append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
               }
             }
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
               pthread_mutex_unlock(&mainw->abuf_frame_mutex);
             }
@@ -823,16 +823,16 @@
                 unsigned char *inbuf=(unsigned char *)out_buffer;
                 xbuf=(unsigned char *)lives_try_malloc(nbytes);
                 if (!xbuf) {
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     pthread_mutex_lock(&mainw->abuf_frame_mutex);
                   }
                   for (i = 0; i < jackd->num_output_channels; i++) {
                     sample_silence_dS(out_buffer[i], numFramesToWrite);
-                    if (mainw->audio_frame_buffer!=NULL) {
+                    if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                       append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
                     }
                   }
-                  if (mainw->audio_frame_buffer!=NULL) {
+                  if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
                     mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
                     pthread_mutex_unlock(&mainw->abuf_frame_mutex);
                   }
@@ -867,16 +867,16 @@
               if (xbuf!=(unsigned char *)out_buffer) lives_free(xbuf);
             }
           } else {
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               pthread_mutex_lock(&mainw->abuf_frame_mutex);
             }
             for (i = 0; i < jackd->num_output_channels; i++) {
-              if (mainw->audio_frame_buffer!=NULL) {
-                sample_silence_dS(out_buffer[i], numFramesToWrite);
+              sample_silence_dS(out_buffer[i], numFramesToWrite);
+              if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
+                append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
               }
-              append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
             }
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
               pthread_mutex_unlock(&mainw->abuf_frame_mutex);
             }
@@ -890,16 +890,16 @@
       } else {
         // no input frames
         nframes=jackFramesAvailable;
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           pthread_mutex_lock(&mainw->abuf_frame_mutex);
         }
         for (i = 0; i < jackd->num_output_channels; i++) {
           sample_silence_dS(out_buffer[i], numFramesToWrite);
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
           }
         }
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
           mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
           pthread_mutex_unlock(&mainw->abuf_frame_mutex);

LiVES-2.4.1.tar.bz2/src/lbindings.c -> LiVES-2.4.2.tar.bz2/src/lbindings.c Changed

LiVES-2.4.1.tar.bz2/src/ldvcallbacks.c -> LiVES-2.4.2.tar.bz2/src/ldvcallbacks.c Changed

@@ -1,6 +1,6 @@
 // ldvcallbacks.c
 // LiVES
-// (c) G. Finch 2006 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2006 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -12,16 +12,26 @@
 
 
 void on_camgrab_clicked(LiVESButton *button, livespointer user_data) {
-  char *msg;
   s_cam *cam=(s_cam *)user_data;
+
+  char *msg;
+
   if (dvgrabw->filename!=NULL) lives_free(dvgrabw->filename);
   dvgrabw->filename=find_free_camfile(cam->format);
   if (dvgrabw->filename==NULL) return;
+
   lives_widget_set_sensitive(dvgrabw->grab,FALSE);
   lives_set_cursor_style(LIVES_CURSOR_BUSY,dvgrabw->dialog);
+
   if (!dvgrabw->playing) on_camplay_clicked(NULL,user_data);
+
+  if (dvgrabw->dirname!=NULL) lives_free(dvgrabw->dirname);
+  dvgrabw->dirname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->dirent)));
+
   msg=lives_strdup_printf(_("Recording to %s/%s"),dvgrabw->dirname,dvgrabw->filename);
   lives_entry_set_text(LIVES_ENTRY(dvgrabw->status_entry),msg);
+  lives_free(msg);
+
   if (cam->format==CAM_FORMAT_DV) {
     dvgrabw->filename=lives_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
   }
@@ -32,6 +42,7 @@
 
 void on_camstop_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
+
   lives_widget_set_sensitive(dvgrabw->stop,FALSE);
   dvgrabw->playing=FALSE;
 
@@ -41,8 +52,10 @@
   }
 
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,dvgrabw->dialog);
+
   camstop(cam);
-  lives_button_set_label(LIVES_BUTTON(dvgrabw->play),"gtk-media-play");
+
+  lives_button_set_label(LIVES_BUTTON(dvgrabw->play),LIVES_STOCK_LABEL_MEDIA_PLAY);
   lives_widget_set_sensitive(dvgrabw->grab,TRUE);
   lives_entry_set_text(LIVES_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
 }
@@ -50,16 +63,18 @@
 
 void on_camplay_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
+
   camplay(cam);
   dvgrabw->playing=!dvgrabw->playing;
   if (dvgrabw->playing) {
-    lives_button_set_label(LIVES_BUTTON(dvgrabw->play),"gtk-media-pause");
+    lives_button_set_label(LIVES_BUTTON(dvgrabw->play),LIVES_STOCK_LABEL_MEDIA_PAUSE);
   } else {
-    lives_button_set_label(LIVES_BUTTON(dvgrabw->play),"gtk-media-play");
+    lives_button_set_label(LIVES_BUTTON(dvgrabw->play),LIVES_STOCK_LABEL_MEDIA_PLAY);
   }
   lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
+
 void on_camrew_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camrew(cam);
@@ -73,20 +88,16 @@
   lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
+
 void on_cameject_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   cameject(cam);
 }
 
 
-boolean on_camdelete_event(LiVESWidget *widget, GdkEvent *event, livespointer user_data) {
-  on_camquit_clicked(NULL,user_data);
-  return FALSE;
-}
-
-
 void on_camquit_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
+
   on_camstop_clicked(button,user_data);
   //if (cam->format==CAM_FORMAT_HDV) close_raw1394(cam->rec_handle);
   lives_widget_destroy(dvgrabw->dialog);

LiVES-2.4.1.tar.bz2/src/ldvcallbacks.h -> LiVES-2.4.2.tar.bz2/src/ldvcallbacks.h Changed

LiVES-2.4.1.tar.bz2/src/ldvgrab.c -> LiVES-2.4.2.tar.bz2/src/ldvgrab.c Changed

@@ -1,6 +1,6 @@
 // ldvgrab.c
 // LiVES
-// (c) G. Finch 2006 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2006 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -34,7 +34,7 @@
 int raw_iso_handler(raw1394handle_t handle, int channel, size_t length, quadlet_t *data) {
   if (length < RAW_BUF_SIZE && channel == g_rx_channel) {
     g_rx_length = length;
-    memcpy(g_rx_packet, data, length);
+    lives_memcpy(g_rx_packet, data, length);
   }
   return 0;
 }
@@ -105,15 +105,18 @@
 }
 
 s_cam *camready(void) {
-  char *msg;
   rom1394_directory rom_dir;
-  int i,j;
 
-  int n_ports;
-  struct raw1394_portinfo pinf[ 16 ];
+  struct raw1394_portinfo pinf[16];
 
   s_cam *cam=(s_cam *)lives_malloc(sizeof(s_cam));
 
+  char *msg;
+
+  int n_ports;
+
+  register int i,j;
+
   cam->device=-1;
 
 #ifdef RAW1394_V_0_8
@@ -134,8 +137,10 @@
 
   if ((n_ports = raw1394_get_port_info(cam->handle, pinf, 16)) < 0) {
     msg=lives_strdup_printf(_("raw1394 - failed to get port info: %s.\n"), lives_strerror(errno));
+    d_print(msg);
+    lives_free(msg);
     raw1394_destroy_handle(cam->handle);
-    return NULL;;
+    return NULL;
   }
 
 
@@ -143,14 +148,18 @@
   for (j = 0; j < n_ports && cam->device == -1; j++) {
 
     if (raw1394_set_port(cam->handle, j) < 0) {
-      d_print(_("\nraw1394 - couldn't set port %d !\n"),j);
+      msg=lives_strdup_printf(_("\nraw1394 - couldn't set port %d !\n"),j);
+      d_print(msg);
+      lives_free(msg);
       continue;
     }
 
     for (i=0; i < raw1394_get_nodecount(cam->handle); ++i) {
 
       if (rom1394_get_directory(cam->handle, i, &rom_dir) < 0) {
-        d_print(_("error reading config rom directory for node %d\n"), i);
+        msg=lives_strdup_printf(_("error reading config rom directory for node %d\n"), i);
+        d_print(msg);
+        lives_free(msg);
         continue;
       }
 
@@ -162,7 +171,7 @@
     }
   }
 
-  if (cam->device == -1) {
+  if (0&&cam->device == -1) {
     do_error_dialog(
       _("\nLiVES could not find any firewire camera.\nPlease make sure your camera is switched on,\nand check that you have read/write permissions for the camera device\n(generally /dev/raw1394*).\n"));
     raw1394_destroy_handle(cam->handle);
@@ -211,9 +220,10 @@
 
 char *find_free_camfile(int format) {
   char *filename=lives_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
-  int i;
   char *fname,*tmp=NULL,*tmp2,*tmp3;
 
+  register int i;
+
   if (format==CAM_FORMAT_HDV) {
     for (i=1; i<10000; i++) {
       fname=lives_strdup_printf("%s%04d.mpg",filename,i);
@@ -284,7 +294,9 @@
                           (tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
                           (tmp3=lives_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
 #endif
+
   cam->pgid=lives_fork(com);
+
   lives_free(com);
   lives_free(tmp2);
   lives_free(tmp3);

LiVES-2.4.1.tar.bz2/src/ldvgrab.h -> LiVES-2.4.2.tar.bz2/src/ldvgrab.h Changed

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

@@ -1,6 +1,6 @@
 // ldvinterface.c
 // LiVES
-// (c) G. Finch 2006-2013 <salsaman@gmail.com>
+// (c) G. Finch 2006-2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -16,13 +16,9 @@
   LiVESWidget *button3;
   LiVESWidget *button4;
   LiVESWidget *buttond;
-  LiVESWidget *image;
   LiVESWidget *vbox;
   LiVESWidget *hbox;
   LiVESWidget *label;
-  LiVESWidget *direntry;
-
-  char *tmp;
 
   struct _dvgrabw *dvgrabw=(struct _dvgrabw *)lives_malloc(sizeof(struct _dvgrabw));
 
@@ -43,7 +39,6 @@
   hbox = lives_hbox_new(FALSE,0);
   lives_box_pack_start(LIVES_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
-
   buttond = lives_standard_file_button_new(TRUE,NULL);
 
   label=lives_standard_label_new_with_mnemonic(_("Save _directory :"),buttond);
@@ -51,13 +46,13 @@
 
   lives_box_pack_start(LIVES_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
-  direntry=lives_standard_entry_new(NULL,FALSE,(tmp=lives_filename_to_utf8(lives_get_current_dir(),-1,NULL,NULL,NULL)),-1,PATH_MAX,
-                                    LIVES_BOX(hbox),NULL);
 
-  lives_free(tmp);
+  dvgrabw->dirname=lives_filename_to_utf8(lives_get_current_dir(),-1,NULL,NULL,NULL);
+  dvgrabw->dirent=lives_standard_entry_new(NULL,FALSE,dvgrabw->dirname,-1,PATH_MAX,
+                  LIVES_BOX(hbox),NULL);
 
 
-  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked), (livespointer)direntry);
+  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked), (livespointer)dvgrabw->dirent);
 
 
   //////////////////
@@ -93,57 +88,32 @@
 
   lives_box_pack_start(LIVES_BOX(vbox),hbuttonbox1,FALSE,FALSE,widget_opts.packing_height);
 
-#if GTK_CHECK_VERSION(2,6,0)
-  button3 = lives_button_new_from_stock(GTK_STOCK_MEDIA_REWIND);
-#else
-  button3 = lives_button_new_from_stock(GTK_STOCK_GO_BACK);
-#endif
+  button3 = lives_button_new_from_stock(LIVES_STOCK_MEDIA_REWIND,NULL);
 
   lives_container_add(LIVES_CONTAINER(hbuttonbox1), button3);
   lives_widget_set_can_focus(button3,TRUE);
 
-#if GTK_CHECK_VERSION(2,6,0)
-  button4 = lives_button_new_from_stock(GTK_STOCK_MEDIA_FORWARD);
-#else
-  button4 = lives_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-#endif
+  button4 = lives_button_new_from_stock(LIVES_STOCK_MEDIA_FORWARD,NULL);
+
   lives_container_add(LIVES_CONTAINER(hbuttonbox1), button4);
   lives_widget_set_can_focus(button4,TRUE);
 
-#if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->stop = lives_button_new_from_stock(GTK_STOCK_MEDIA_STOP);
-#else
-  dvgrabw->stop = lives_button_new_from_stock(GTK_STOCK_STOP);
-#endif
+  dvgrabw->stop = lives_button_new_from_stock(LIVES_STOCK_MEDIA_STOP,NULL);
+
   lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->stop);
   lives_widget_set_can_focus_and_default(dvgrabw->stop);
   lives_widget_set_sensitive(dvgrabw->stop,FALSE);
 
-#if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->play = lives_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
-#else
-  dvgrabw->play = lives_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-#endif
+  dvgrabw->play = lives_button_new_from_stock(LIVES_STOCK_MEDIA_PLAY,NULL);
+
   lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->play);
   lives_widget_set_can_focus_and_default(dvgrabw->play);
 
+  dvgrabw->grab = lives_button_new_from_stock(LIVES_STOCK_MEDIA_RECORD,_("_Grab"));
 
-#if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->grab = lives_button_new_from_stock(GTK_STOCK_MEDIA_RECORD);
-#else
-  dvgrabw->grab = lives_button_new_from_stock(GTK_STOCK_NO);
-#endif
   lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->grab);
   lives_widget_set_can_focus_and_default(dvgrabw->grab);
 
-#if GTK_CHECK_VERSION(2,6,0)
-  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_RECORD,LIVES_ICON_SIZE_BUTTON);
-#else
-  image = lives_image_new_from_stock(GTK_STOCK_NO,LIVES_ICON_SIZE_BUTTON);
-#endif
-  lives_button_set_label(LIVES_BUTTON(dvgrabw->grab),_("_Grab"));
-  lives_button_set_image(LIVES_BUTTON(dvgrabw->grab),image);
-
   label=lives_standard_label_new(
           _("\nUse this tool to control your camera and grab clips.\nAfter grabbing your clips, you can close this window \nand then load them into LiVES.\n"));
   lives_box_pack_start(LIVES_BOX(vbox),label,FALSE,FALSE,widget_opts.packing_height*4);
@@ -152,13 +122,11 @@
   hbuttonbox2 = lives_hbutton_box_new();
   lives_box_pack_start(LIVES_BOX(vbox),hbuttonbox2,FALSE,FALSE,widget_opts.packing_height);
 
-  dvgrabw->quit = lives_button_new_from_stock(GTK_STOCK_CLOSE);
+  dvgrabw->quit = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window"));
+
   lives_container_add(LIVES_CONTAINER(hbuttonbox2), dvgrabw->quit);
   lives_widget_set_can_focus_and_default(dvgrabw->quit);
 
-  image=lives_image_new_from_stock(LIVES_STOCK_CLOSE,LIVES_ICON_SIZE_BUTTON);
-  lives_button_set_label(LIVES_BUTTON(dvgrabw->quit),_("_Close Window"));
-  lives_button_set_image(LIVES_BUTTON(dvgrabw->quit),image);
 
   //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -172,8 +140,6 @@
 
   lives_widget_show_all(dvgrabw->dialog);
 
-  dvgrabw->dirname=NULL;
-
   return dvgrabw;
 }

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

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

@@ -95,6 +95,8 @@
 
 static boolean no_recover=FALSE,auto_recover=FALSE;
 static boolean upgrade_error=FALSE;
+static boolean info_only;
+
 static char start_file[PATH_MAX];
 static double start=0.;
 static int end=0;
@@ -451,6 +453,8 @@
   lives_snprintf(prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
 #endif
 
+  info_only=FALSE;
+
   // check the backend is there, get some system details and prefs
   capable=get_capabilities();
 
@@ -1146,7 +1150,7 @@
     mainw->ext_playback=mainw->ext_keyboard=FALSE;
 
     get_pref("default_image_format",buff,256);
-    if (!strcmp(buff,"jpeg")) lives_snprintf(prefs->image_ext,16,"%s","jpg");
+    if (!strcmp(buff,"jpeg")) lives_snprintf(prefs->image_ext,16,"%s",LIVES_FILE_EXT_JPG);
     else lives_snprintf(prefs->image_ext,16,"%s",buff);
 
     prefs->loop_recording=TRUE;
@@ -1246,7 +1250,7 @@
     prefs->ce_thumb_mode=FALSE;
 #endif
 
-    prefs->show_button_images=FALSE;
+    prefs->show_button_images=get_boolean_pref("show_button_icons");
 
     prefs->push_audio_to_gens=TRUE;
 
@@ -2051,15 +2055,18 @@
 
 capability *get_capabilities(void) {
   // get capabilities of backend system
-  char *safer_bfile;
+  FILE *bootfile;
+
   char **array;
 
+  char *safer_bfile;
+  char *tmp;
+
   char buffer[4096+PATH_MAX];
-  FILE *bootfile;
   char string[256];
+
   int err;
   int numtok;
-  char *tmp;
 
 #ifdef IS_DARWIN
   processor_info_array_t processorInfo;
@@ -2073,6 +2080,7 @@
 #endif
 #endif
 
+
   capable=(capability *)lives_malloc(sizeof(capability));
 
 
@@ -2257,9 +2265,11 @@
     if (!strcmp(array[3],"!updmsg")) {
       char *text=get_upd_msg();
       lives_snprintf(capable->startup_msg,256,"%s\n\n",text);
+      info_only=TRUE;
       lives_free(text);
 
       if (numtok>4&&strlen(array[4])) {
+        info_only=FALSE;
         lives_strappend(capable->startup_msg,256,array[4]);
       }
     } else {
@@ -2548,6 +2558,7 @@
 #endif
                 else {
                   if (strlen(capable->startup_msg)) {
+                    if (info_only) startup_message_info(capable->startup_msg);
                     startup_message_nonfatal(capable->startup_msg);
                   } else {
                     // non-fatal errors
@@ -4326,7 +4337,7 @@
   xxwidth=width;
   xxheight=height;
 
-  if (!strcmp(img_ext,"png")) {
+  if (!strcmp(img_ext,LIVES_FILE_EXT_PNG)) {
 #ifdef USE_LIBPNG
     boolean ret=layer_from_png(fp,layer,TRUE);
     fclose(fp);
@@ -4338,7 +4349,7 @@
 #endif
   }
 #ifdef GUI_GTK
-  else if (!strcmp(img_ext,"jpg")) pbload=gdk_pixbuf_loader_new_with_type("jpeg",gerror);
+  else if (!strcmp(img_ext,LIVES_FILE_EXT_JPG)) pbload=gdk_pixbuf_loader_new_with_type("jpeg",gerror);
   else pbload=gdk_pixbuf_loader_new();
 
   lives_signal_connect(LIVES_WIDGET_OBJECT(pbload), LIVES_WIDGET_SIZE_PREPARED_SIGNAL,
@@ -4493,6 +4504,9 @@
   int clip=weed_get_int_value(layer,"clip",&error);
   int frame=weed_get_int_value(layer,"frame",&error);
   int clip_type;
+#ifdef HAVE_POSIX_FADVISE
+  int fd;
+#endif
 
   boolean is_thread=FALSE;
 
@@ -4527,7 +4541,7 @@
       weed_set_int_value(layer,"width",width);
       weed_set_int_value(layer,"height",height);
       if (!weed_plant_has_leaf(layer,"current_palette")) {
-        if (image_ext==NULL||!strcmp(image_ext,"jpg")) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
+        if (image_ext==NULL||!strcmp(image_ext,LIVES_FILE_EXT_JPG)) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
         else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32);
       }
       create_empty_pixel_data(layer,TRUE,TRUE);
@@ -4629,13 +4643,29 @@
       } else {
         // pull frame from decoded images
         boolean ret;
-        char *fname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,frame,image_ext);
+        char *fname=make_image_file_name(sfile,frame,image_ext);
         if (height*width==0) {
           ret=weed_layer_new_from_file_progressive(layer,fname,0,0,image_ext,&gerror);
         } else {
           ret=weed_layer_new_from_file_progressive(layer,fname,width,height,image_ext,&gerror);
         }
         lives_free(fname);
+
+#ifdef HAVE_POSIX_FADVISE
+        // advise that we will read the next frame
+        if (sfile->pb_fps>0.)
+          fname=make_image_file_name(sfile,frame+1,image_ext);
+        else
+          fname=make_image_file_name(sfile,frame-1,image_ext);
+
+        fd=open(fname,O_RDONLY);
+        if (fd>-1) {
+          posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
+          close(fd);
+        }
+        lives_free(fname);
+#endif
+
         mainw->osc_block=FALSE;
         if (ret==FALSE) return FALSE;
       }
@@ -4683,6 +4713,7 @@
     mainw->osc_block=FALSE;
     return FALSE;
   }
+
   mainw->osc_block=FALSE;
 
   if (!is_thread) {
@@ -4807,7 +4838,7 @@
   weed_set_int_value(layer,"clip",clip);
   weed_set_int_value(layer,"frame",frame);
 
-  if (!strcmp(image_ext,"png")) palette=WEED_PALETTE_RGBA32;
+  if (!strcmp(image_ext,LIVES_FILE_EXT_PNG)) palette=WEED_PALETTE_RGBA32;
   else palette=WEED_PALETTE_RGB24;
 
   if (pull_frame_at_size(layer,image_ext,tc,width,height,palette)) {
@@ -4987,6 +5018,25 @@
 }
 
 
+static void load_frame_cleanup(boolean noswitch) {
+  char *tmp;
+
+  if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
+  mainw->frame_layer=NULL;
+  mainw->noswitch=noswitch;
+
+  if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor)&&
+      mainw->current_file!=mainw->scrap_file) get_play_times();
+  if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
+
+  // format is now msg|timecode|fgclip|fgframe|fgfps|
+  lives_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const char *)
+               (tmp=lives_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
+                                        mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
+  lives_free(tmp);
+}
+
+
 
 
 void load_frame_image(int frame) {
@@ -5258,7 +5308,7 @@
       // play preview
       if (cfile->opening||(cfile->next_event!=NULL&&cfile->proc_ptr==NULL)) {

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

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

LiVES-2.4.1.tar.bz2/src/merge.c -> LiVES-2.4.2.tar.bz2/src/merge.c Changed

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

LiVES-2.4.1.tar.bz2/src/omc-learn.c -> LiVES-2.4.2.tar.bz2/src/omc-learn.c Changed

LiVES-2.4.1.tar.bz2/src/osc.c -> LiVES-2.4.2.tar.bz2/src/osc.c Changed

@@ -34,6 +34,9 @@
 #include "resample.h"
 #include "paramwindow.h"
 #include "ce_thumbs.h"
+#ifdef HAVE_UNICAP
+#include "videodev.h"
+#endif
 #include "lbindings.h"
 
 void *status_socket;
@@ -380,6 +383,8 @@
       retval=tmp;
     }
     lives_free(vals);
+    //g_print("get from %p %s %s\n", plant, key, tmp);
+
     break;
   }
 
@@ -690,10 +695,21 @@
 
 boolean lives_osc_cb_set_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int lmode;
+  char *boolstr;
 
   if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
     lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&lmode);
+    boolstr=lives_strdup_printf("%d",lmode);
+    if (!strcmp(boolstr,get_omc_const("LIVES_TRUE"))) lmode=TRUE;
+    else {
+      if (!strcmp(boolstr,get_omc_const("LIVES_FALSE"))) lmode=FALSE;
+      else {
+        lives_free(boolstr);
+        return lives_osc_notify_failure();
+      }
+    }
+    lives_free(boolstr);
   } else return lives_osc_notify_failure();
 
   if ((lmode && !mainw->ping_pong) || (!lmode && mainw->ping_pong))
@@ -933,7 +949,7 @@
     if (mainw->files[clip]!=NULL&&(mainw->files[clip]->clip_type==CLIP_TYPE_DISK||mainw->files[clip]->clip_type==CLIP_TYPE_FILE)) {
       if (mainw->playing_file!=0) {
         char *msg=lives_strdup_printf("%d",clip);
-        switch_clip(1,clip);
+        switch_clip(1,clip,FALSE);
         lives_osc_notify_success(msg);
         lives_free(msg);
         return TRUE;
@@ -957,7 +973,7 @@
   if (clip>0&&clip<MAX_FILES-1) {
     if (mainw->files[clip]!=NULL&&(mainw->files[clip]->clip_type==CLIP_TYPE_DISK||mainw->files[clip]->clip_type==CLIP_TYPE_FILE)) {
       char *msg=lives_strdup_printf("%d",clip);
-      switch_clip(2,clip);
+      switch_clip(2,clip,FALSE);
       lives_osc_notify_success(msg);
       lives_free(msg);
       return TRUE;
@@ -988,7 +1004,7 @@
   if (i==mainw->current_file) return lives_osc_notify_failure();
   if (mainw->playing_file!=0) {
     char *msg;
-    switch_clip(1,i);
+    switch_clip(1,i,FALSE);
     msg=lives_strdup_printf("%d",i);
     lives_osc_notify_success(msg);
     lives_free(msg);
@@ -1023,7 +1039,7 @@
 
   if (i==mainw->blend_file) return lives_osc_notify_failure();
 
-  switch_clip(2,i);
+  switch_clip(2,i,FALSE);
 
   msg=lives_strdup_printf("%d",i);
   lives_osc_notify_success(msg);
@@ -1069,6 +1085,8 @@
   int clipno=mainw->current_file;
   int current_file=clipno;
 
+  char *boolstr;
+
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
   if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
@@ -1081,6 +1099,17 @@
     return lives_osc_notify_failure();
   }
 
+  boolstr=lives_strdup_printf("%d",noaudio);
+  if (!strcmp(boolstr,get_omc_const("LIVES_TRUE"))) noaudio=TRUE;
+  else {
+    if (!strcmp(boolstr,get_omc_const("LIVES_FALSE"))) noaudio=FALSE;
+    else {
+      lives_free(boolstr);
+      return lives_osc_notify_failure();
+    }
+  }
+  lives_free(boolstr);
+
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->multitrack!=NULL&&clipno==mainw->multitrack->render_file))
     return lives_osc_notify_failure();
 
@@ -1166,6 +1195,8 @@
   int start,end,current_file=clipno;
   boolean ccpd;
 
+  char *boolstr;
+
   if (mainw->playing_file>-1||mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
@@ -1182,6 +1213,17 @@
     return lives_osc_notify_failure();
   }
 
+  boolstr=lives_strdup_printf("%d",noaudio);
+  if (!strcmp(boolstr,get_omc_const("LIVES_TRUE"))) noaudio=TRUE;
+  else {
+    if (!strcmp(boolstr,get_omc_const("LIVES_FALSE"))) noaudio=FALSE;
+    else {
+      lives_free(boolstr);
+      return lives_osc_notify_failure();
+    }
+  }
+  lives_free(boolstr);
+
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
@@ -1249,6 +1291,9 @@
   int current_file=clipno;
   boolean ccpd;
 
+  char *boolstr;
+
+
   if (mainw->playing_file>-1||mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
@@ -1265,6 +1310,17 @@
     return lives_osc_notify_failure();
   }
 
+  boolstr=lives_strdup_printf("%d",noaudio);
+  if (!strcmp(boolstr,get_omc_const("LIVES_TRUE"))) noaudio=TRUE;
+  else {
+    if (!strcmp(boolstr,get_omc_const("LIVES_FALSE"))) noaudio=FALSE;
+    else {
+      lives_free(boolstr);
+      return lives_osc_notify_failure();
+    }
+  }
+  lives_free(boolstr);
+
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
@@ -1293,6 +1349,8 @@
   int current_file=clipno;
   boolean ccpd;
 
+  char *boolstr;
+
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
@@ -1310,6 +1368,18 @@
     return lives_osc_notify_failure();
   }
 
+
+  boolstr=lives_strdup_printf("%d",noaudio);
+  if (!strcmp(boolstr,get_omc_const("LIVES_TRUE"))) noaudio=TRUE;
+  else {
+    if (!strcmp(boolstr,get_omc_const("LIVES_FALSE"))) noaudio=FALSE;
+    else {
+      lives_free(boolstr);
+      return lives_osc_notify_failure();
+    }
+  }
+  lives_free(boolstr);
+
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
@@ -1341,6 +1411,8 @@
   int current_file=clipno;
   boolean ccpd;
 
+  char *boolstr;
+
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
@@ -1358,6 +1430,18 @@
     return lives_osc_notify_failure();
   }

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

@@ -917,7 +917,7 @@
 
   if (top_dialog_vbox!=NULL) {
 
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
 
     fxw_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
     lives_window_add_accel_group(LIVES_WINDOW(fx_dialog[didx]), fxw_accel_group);
@@ -931,23 +931,24 @@
                                    LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
       if (is_defaults) {
-        okbutton = lives_button_new_with_mnemonic(_("Set as default"));
+        okbutton = lives_button_new_from_stock(LIVES_STOCK_APPLY,_("Set as default"));
         if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
-        resetbutton = lives_button_new_with_mnemonic(_("Reset"));
+        resetbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED,_("Reset"));
         if (!has_param) lives_widget_set_sensitive(resetbutton,FALSE);
         lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), resetbutton, LIVES_RESPONSE_RESET);
-      } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+      } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
       lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
     } else {
-      okbutton = lives_button_new_with_mnemonic(_("Set as default"));
+      okbutton = lives_button_new_from_stock(LIVES_STOCK_APPLY,_("Set as default"));
       if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
-      cancelbutton = lives_button_new_with_mnemonic(_("Close _window"));
+      cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window"));
+
       if (no_process) {
         LiVESWidget *dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[didx]));
         lives_button_box_set_button_width(LIVES_BUTTON_BOX(dialog_action_area), okbutton, DEF_BUTTON_WIDTH*4);
       }
       if (rfx->status==RFX_STATUS_WEED) {
-        resetbutton = lives_button_new_with_mnemonic(_("Reset"));
+        resetbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED,_("Reset"));
         lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), resetbutton, LIVES_RESPONSE_RESET);
         lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
       }

LiVES-2.4.1.tar.bz2/src/plugins.c -> LiVES-2.4.2.tar.bz2/src/plugins.c Changed

@@ -1051,7 +1051,7 @@
   }
 
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
   lives_widget_set_can_focus(cancelbutton,TRUE);
 
@@ -1059,12 +1059,12 @@
                                LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE_AS);
+  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE_AS,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), savebutton, 1);
   lives_widget_set_can_focus(savebutton,TRUE);
   lives_widget_set_tooltip_text(savebutton, _("Save settings to an alternate file.\n"));
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -2094,7 +2094,7 @@
       continue;
     }
 
-    if (!strcmp(img_ext,"jpg")) {
+    if (!strcmp(img_ext,LIVES_FILE_EXT_JPG)) {
       list=listnext;
       continue;
     }
@@ -2104,7 +2104,7 @@
       encoders=lives_list_delete_link(encoders,list);
     } else {
       caps=atoi((char *)lives_list_nth_data(encoder_capabilities,0));
-      if (!(caps&CAN_ENCODE_PNG)&&!strcmp(img_ext,"png")) {
+      if (!(caps&CAN_ENCODE_PNG)&&!strcmp(img_ext,LIVES_FILE_EXT_PNG)) {
         lives_free((livespointer)list->data);
         encoders=lives_list_delete_link(encoders,list);
       }
@@ -2637,10 +2637,10 @@
   }
 
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);

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

@@ -454,6 +454,17 @@
     } else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) {
       prefs->audio_src=AUDIO_SRC_INT;
       set_int_pref("audio_src",AUDIO_SRC_INT);
+
+      mainw->aud_rec_fd=-1;
+      if (prefs->perm_audio_reader) {
+#ifdef ENABLE_JACK
+        jack_rec_audio_end(TRUE,TRUE);
+#endif
+#ifdef HAVE_PULSE_AUDIO
+        pulse_rec_audio_end(TRUE,TRUE);
+#endif
+      }
+
     }
     if (prefsw!=NULL)
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT);
@@ -592,6 +603,7 @@
   boolean show_tool=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->show_tool));
   boolean mouse_scroll=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mouse_scroll));
   boolean ce_maxspect=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_ce_maxspect));
+  boolean show_button_icons=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_button_icons));
 
   int fsize_to_warn=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_warn_fsize));
   int dl_bwidth=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_bwidth));
@@ -645,12 +657,14 @@
   boolean jack_tb_start=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start));
   boolean jack_tb_client=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client));
 #else
+#ifdef ENABLE_JACK
   boolean jack_tstart=FALSE;
   boolean jack_master=FALSE;
   boolean jack_client=FALSE;
   boolean jack_tb_start=FALSE;
   boolean jack_tb_client=FALSE;
 #endif
+#endif
 
 #ifdef ENABLE_JACK
   boolean jack_astart=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack));
@@ -796,6 +810,11 @@
     set_boolean_pref("mouse_scroll_clips",mouse_scroll);
   }
 
+  if (show_button_icons!=(prefs->show_button_images)) {
+    prefs->show_button_images=show_button_icons;
+    set_boolean_pref("show_button_icons",show_button_icons);
+  }
+
   if (ce_maxspect!=(prefs->ce_maxspect)) {
     prefs->ce_maxspect=ce_maxspect;
     set_boolean_pref("ce_maxspect",ce_maxspect);
@@ -967,12 +986,12 @@
   }
 
   // jpeg/png
-  if (strcmp(prefs->image_ext,"jpg")&&ext_jpeg) {
+  if (strcmp(prefs->image_ext,LIVES_FILE_EXT_JPG)&&ext_jpeg) {
     set_pref("default_image_format","jpeg");
-    lives_snprintf(prefs->image_ext,16,"jpg");
-  } else if (!strcmp(prefs->image_ext,"jpg")&&!ext_jpeg) {
+    lives_snprintf(prefs->image_ext,16,LIVES_FILE_EXT_JPG);
+  } else if (!strcmp(prefs->image_ext,LIVES_FILE_EXT_JPG)&&!ext_jpeg) {
     set_pref("default_image_format","png");
-    lives_snprintf(prefs->image_ext,16,"png");
+    lives_snprintf(prefs->image_ext,16,LIVES_FILE_EXT_PNG);
   }
 
   // instant open
@@ -2229,6 +2248,12 @@
 
   add_fill_to_box(LIVES_BOX(hbox));
 
+
+  prefsw->checkbutton_button_icons =
+    lives_standard_check_button_new(_("Show icons in buttons"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_button_icons), prefs->show_button_images);
+
+
   // ---
   hbox = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
@@ -2547,7 +2572,7 @@
   lives_free(tmp2);
 
   // advanced instant opening
-  advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+  advbutton = lives_button_new_from_stock(LIVES_STOCK_PREFERENCES,_("_Advanced"));
   lives_box_pack_start(LIVES_BOX(hbox), advbutton, FALSE, FALSE, widget_opts.packing_width*4);
 
   lives_signal_connect(LIVES_GUI_OBJECT(advbutton), LIVES_WIDGET_CLICKED_SIGNAL,
@@ -2599,7 +2624,7 @@
   jpeg_png = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->jpeg));
 
   png = lives_standard_radio_button_new(_("_png"),TRUE,jpeg_png,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(png),!strcmp(prefs->image_ext,"png"));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(png),!strcmp(prefs->image_ext,LIVES_FILE_EXT_PNG));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
@@ -2736,7 +2761,7 @@
   pp_combo = lives_standard_combo_new(_("_Plugin"),TRUE,vid_playback_plugins,LIVES_BOX(hbox),NULL);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+  advbutton = lives_button_new_from_stock(LIVES_STOCK_PREFERENCES,_("_Advanced"));
   lives_box_pack_start(LIVES_BOX(hbox), advbutton, FALSE, FALSE, 40);
 
   lives_signal_connect(LIVES_GUI_OBJECT(advbutton), LIVES_WIDGET_CLICKED_SIGNAL,
@@ -4251,7 +4276,7 @@
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
   // Preferences 'Revert' button
-  prefsw->cancelbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED);
+  prefsw->cancelbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED,NULL);
   lives_widget_show(prefsw->cancelbutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->cancelbutton, LIVES_RESPONSE_CANCEL);
 
@@ -4261,7 +4286,7 @@
   lives_widget_set_sensitive(prefsw->cancelbutton, FALSE);
 
   // Preferences 'Apply' button
-  prefsw->applybutton = lives_button_new_from_stock(LIVES_STOCK_APPLY);
+  prefsw->applybutton = lives_button_new_from_stock(LIVES_STOCK_APPLY,NULL);
   lives_widget_show(prefsw->applybutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->applybutton, 0);
 
@@ -4270,7 +4295,7 @@
   lives_widget_set_sensitive(prefsw->applybutton, FALSE);
 
   // Preferences 'Close' button
-  prefsw->closebutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE);
+  prefsw->closebutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE,NULL);
   lives_widget_show(prefsw->closebutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->closebutton, LIVES_RESPONSE_OK);
 
@@ -4306,6 +4331,8 @@
                        NULL);
   lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_ce_maxspect), LIVES_WIDGET_TOGGLED_SIGNAL,
                        LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_button_icons), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
   lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_ce), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
                        NULL);
   lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_mt), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),

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

LiVES-2.4.1.tar.bz2/src/pulse.c -> LiVES-2.4.2.tar.bz2/src/pulse.c Changed

@@ -153,7 +153,7 @@
     buff=(uint8_t *)lives_try_malloc0(xbytes);
     if (!buff) return;
     if (pdriver->astream_fd!=-1) audio_stream(buff,xbytes,pdriver->astream_fd);
-    if (mainw->audio_frame_buffer!=NULL) {
+    if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
       pthread_mutex_lock(&mainw->abuf_frame_mutex);
       append_to_audio_buffer16(mainw->audio_frame_buffer,buff,xbytes/2,0);
       mainw->audio_frame_buffer->samples_filled+=xbytes/2;
@@ -687,7 +687,7 @@
             needs_free=TRUE;
           }
           if (pulsed->astream_fd!=-1) audio_stream(buffer,xbytes,pulsed->astream_fd);
-          if (mainw->audio_frame_buffer!=NULL) {
+          if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
             pthread_mutex_lock(&mainw->abuf_frame_mutex);
             append_to_audio_buffer16(mainw->audio_frame_buffer,buffer,xbytes/2,0);
             mainw->audio_frame_buffer->samples_filled+=xbytes/2;
@@ -701,7 +701,7 @@
             if (!shortbuffer) return;
             sample_move_abuf_int16(shortbuffer,pulsed->out_achans,(xbytes>>1)/pulsed->out_achans,pulsed->out_arate);
             if (pulsed->astream_fd!=-1) audio_stream(shortbuffer,xbytes,pulsed->astream_fd);
-            if (mainw->audio_frame_buffer!=NULL) {
+            if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src!=AUDIO_SRC_EXT) {
               pthread_mutex_lock(&mainw->abuf_frame_mutex);
               append_to_audio_buffer16(mainw->audio_frame_buffer,shortbuffer,xbytes/2,0);
               mainw->audio_frame_buffer->samples_filled+=xbytes/2;
@@ -889,7 +889,7 @@
 
         sample_move_d16_float(fltbuf[i],(short *)data+i,xnframes,pulsed->in_achans,FALSE,FALSE,1.0);
 
-        if (mainw->audio_frame_buffer!=NULL) {
+        if (mainw->audio_frame_buffer!=NULL&&prefs->audio_src==AUDIO_SRC_EXT) {
           // if we have audio triggered gens., push audio to it
           pthread_mutex_lock(&mainw->abuf_frame_mutex);
           append_to_audio_bufferf(mainw->audio_frame_buffer,fltbuf[i],xnframes,i);
@@ -901,6 +901,7 @@
       if (memok) {
         int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->in_arate*U_SEC);
         // apply any audio effects with in channels but no out channels
+
         weed_apply_audio_effects_rt(fltbuf,pulsed->in_achans,xnframes,pulsed->in_arate,tc,TRUE);
 
         for (i=0; i<pulsed->in_achans; i++) {
@@ -916,6 +917,9 @@
 
   if (pulsed->playing_file==-1||(mainw->record&&mainw->record_paused)) {
     pa_stream_drop(pulsed->pstream);
+    if (pulsed->playing_file==-1) {
+      pa_stream_flush(pulsed->pstream,NULL,NULL); // if not recording, flush the rest of audio (to reduce latency)
+    }
     return;
   }
 
@@ -962,11 +966,13 @@
 
 
 void pulse_close_client(pulse_driver_t *pdriver) {
-  pa_threaded_mainloop_lock(pa_mloop);
-  pa_stream_set_write_callback(pdriver->pstream,NULL,NULL);
-  pa_stream_set_read_callback(pdriver->pstream,NULL,NULL);
-  if (pdriver->pstream!=NULL) pa_stream_disconnect(pdriver->pstream);
-  pa_threaded_mainloop_unlock(pa_mloop);
+  if (pdriver->pstream!=NULL) {
+    pa_threaded_mainloop_lock(pa_mloop);
+    pa_stream_set_write_callback(pdriver->pstream,NULL,NULL);
+    pa_stream_set_read_callback(pdriver->pstream,NULL,NULL);
+    pa_stream_disconnect(pdriver->pstream);
+    pa_threaded_mainloop_unlock(pa_mloop);
+  }
   if (pdriver->pa_props!=NULL) pa_proplist_free(pdriver->pa_props);
   pdriver->pa_props=NULL;
   pdriver->pstream=NULL;
@@ -1114,6 +1120,7 @@
   } else {
     pa_battr.maxlength=(uint32_t)-1;
     pa_battr.tlength=(uint32_t)-1;
+    pa_battr.fragsize=LIVES_PA_BUFF_FRAGSIZE;
   }
 
   pa_battr.minreq=(uint32_t)-1;

LiVES-2.4.1.tar.bz2/src/pulse.h -> LiVES-2.4.2.tar.bz2/src/pulse.h Changed

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

@@ -1542,7 +1542,7 @@
     lives_widget_show(dialog_action_area);
     lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
 
     lives_dialog_add_action_widget(LIVES_DIALOG(resaudw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
     lives_widget_set_can_focus_and_default(cancelbutton);
@@ -1551,7 +1551,7 @@
           LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
 
     lives_dialog_add_action_widget(LIVES_DIALOG(resaudw->dialog), okbutton, LIVES_RESPONSE_OK);
     lives_widget_set_can_focus_and_default(okbutton);
@@ -1715,14 +1715,14 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(new_pb_speed));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(new_pb_speed), cancelbutton, LIVES_RESPONSE_CANCEL);
   lives_widget_set_can_focus(cancelbutton,TRUE);
 
   lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
                                LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  change_pb_ok = lives_button_new_from_stock(LIVES_STOCK_OK);
+  change_pb_ok = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(new_pb_speed), change_pb_ok, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(change_pb_ok);
   lives_widget_grab_default(change_pb_ok);

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

@@ -332,10 +332,10 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(rfxbuilder->dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(rfxbuilder->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(rfxbuilder->dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -645,14 +645,14 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   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_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -1010,10 +1010,10 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -2902,11 +2902,11 @@
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
   lives_widget_set_can_focus_and_default(cancelbutton);
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(okbutton);
 
@@ -4228,10 +4228,10 @@
   lives_widget_show(dialog_action_area);
   lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  copy_script_okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  copy_script_okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), copy_script_okbutton, LIVES_RESPONSE_OK);
   lives_widget_set_can_focus_and_default(copy_script_okbutton);
   lives_widget_grab_default(copy_script_okbutton);

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

@@ -1753,7 +1753,7 @@
   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);
+  ok_button = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
   lives_widget_show(ok_button);
 
   lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
@@ -2280,7 +2280,7 @@
 
     mode_group=NULL;
 
-    clear_all_button = lives_button_new_with_mnemonic(_("_Clear all effects"));
+    clear_all_button = lives_button_new_from_stock(LIVES_STOCK_CLEAR,_("_Clear all effects"));
 
     for (j=0; j<modes; j++) {
       idx=i*modes+j;
@@ -2381,17 +2381,17 @@
   lives_container_add(LIVES_CONTAINER(hbuttonbox), clear_all_button);
   lives_widget_set_can_focus_and_default(clear_all_button);
 
-  save_keymap_button = lives_button_new_with_mnemonic(_("_Save as default keymap"));
+  save_keymap_button = lives_button_new_from_stock(LIVES_STOCK_SAVE_AS,_("_Save as default keymap"));
 
   lives_container_add(LIVES_CONTAINER(hbuttonbox), save_keymap_button);
   lives_widget_set_can_focus_and_default(save_keymap_button);
 
-  load_keymap_button = lives_button_new_with_mnemonic(_("_Load default keymap"));
+  load_keymap_button = lives_button_new_from_stock(LIVES_STOCK_OPEN,_("_Load default keymap"));
 
   lives_container_add(LIVES_CONTAINER(hbuttonbox), load_keymap_button);
   lives_widget_set_can_focus_and_default(load_keymap_button);
 
-  ok_button = lives_button_new_with_mnemonic(_("Close _window"));
+  ok_button = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("Close _window"));
 
   lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
   lives_widget_set_can_focus_and_default(ok_button);

LiVES-2.4.1.tar.bz2/src/saveplay.c -> LiVES-2.4.2.tar.bz2/src/saveplay.c Changed

@@ -1,3 +1,4 @@
+
 // saveplay.c
 // LiVES (lives-exe)
 // (c) G. Finch 2003 - 2015
@@ -338,7 +339,7 @@
       mainw->multitrack->has_audio_file=TRUE;
     }
 
-    if (!strcmp(prefs->image_ext,"png")) cfile->img_type=IMG_TYPE_PNG;
+    if (!strcmp(prefs->image_ext,LIVES_FILE_EXT_PNG)) cfile->img_type=IMG_TYPE_PNG;
 
     if (prefs->instant_open) {
       // cd to clip directory - so decoder plugins can write temp files
@@ -529,6 +530,7 @@
               lives_free(msgstr);
 
               cfile->opening=FALSE;
+
               reget_afilesize(mainw->current_file);
               get_total_time(cfile);
 
@@ -2323,7 +2325,7 @@
     }
 
     // blank the background if asked to
-    if ((mainw->faded||(mainw->fs&&!mainw->sep_win))&&(cfile->frames>0||mainw->foreign)) {
+    if ((mainw->faded||(prefs->show_playwin&&!prefs->show_gui)||(mainw->fs&&(!mainw->sep_win)))&&(cfile->frames>0||mainw->foreign)) {
       fade_background();
     }
 
@@ -2458,8 +2460,10 @@
         } else {
           // this doesn't get called if we don't call resize_play_window()
           if (mainw->play_window!=NULL) {
-            lives_window_present(LIVES_WINDOW(mainw->play_window));
-            lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+            if (prefs->show_playwin) {
+              lives_window_present(LIVES_WINDOW(mainw->play_window));
+              lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+            }
           }
         }
       }
@@ -3127,9 +3131,10 @@
 
   if (!is_realtime_aplayer(audio_player)) mainw->mute=mute;
 
-  if (!mainw->preview||!cfile->opening) {
+  if (!mainw->preview&&!cfile->opening) {
     sensitize();
   }
+
   if (mainw->current_file>-1&&cfile->opening) {
     lives_widget_set_sensitive(mainw->mute_audio, cfile->achans>0);
     lives_widget_set_sensitive(mainw->loop_continue, TRUE);
@@ -3203,8 +3208,10 @@
             lives_free(title);
             lives_free(xtrabit);
 
-            lives_window_present(LIVES_WINDOW(mainw->play_window));
-            lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+            if (prefs->show_playwin) {
+              lives_window_present(LIVES_WINDOW(mainw->play_window));
+              lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+            }
             unhide_cursor(lives_widget_get_xwindow(mainw->play_window));
           }
         }
@@ -3325,10 +3332,11 @@
     if (!mainw->preview&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
       // just deinit the generator here, to possibly save CPU cycles
       mainw->osc_block=TRUE;
-      wge_inner((weed_plant_t *)cfile->ext_src);
+      wge_inner((weed_plant_t *)cfile->ext_src,FALSE);
       mainw->osc_block=FALSE;
     }
     deal_with_render_choice(TRUE);
+    sensitize();
   }
 
   mainw->record_paused=mainw->record_starting=FALSE;
@@ -3474,7 +3482,7 @@
   cfile->keep_without_preview=FALSE;
   cfile->cb_src=-1;
 
-  if (!strcmp(prefs->image_ext,"jpg")) cfile->img_type=IMG_TYPE_JPEG;
+  if (!strcmp(prefs->image_ext,LIVES_FILE_EXT_JPG)) cfile->img_type=IMG_TYPE_JPEG;
   else cfile->img_type=IMG_TYPE_PNG;
 
   cfile->bpp=(cfile->img_type==IMG_TYPE_JPEG)?24:32;
@@ -3561,8 +3569,19 @@
 
 
   if (!strcmp(mainw->msg,"killed")) {
+    char *com;
+
     get_frame_count(mainw->current_file);
     cfile->frames--; // just in case last frame is damaged
+
+    // commit audio
+    mainw->cancelled=CANCEL_NONE;
+    unlink(cfile->info_file);
+
+    com=lives_strdup_printf("%s commit_audio \"%s\" 1",prefs->backend,cfile->handle);
+    lives_system(com, TRUE);
+    lives_free(com);
+
     reget_afilesize(mainw->current_file);
     d_print(_("%d frames are enough !\n"),cfile->frames);
   } else {
@@ -4902,8 +4921,7 @@
 
   int i,fd;
 
-  char *oname=lives_strdup_printf("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,frame);
-
+  char *oname=make_image_file_name(mainw->files[mainw->scrap_file],frame,LIVES_FILE_EXT_SCRAP);
 
   ssize_t bytes;
   ssize_t tsize;
@@ -5027,8 +5045,7 @@
 
   void **pdata;
 
-  char *oname=lives_strdup_printf("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,
-                                  mainw->files[mainw->scrap_file]->frames+1);
+  char *oname=make_image_file_name(mainw->files[mainw->scrap_file],mainw->files[mainw->scrap_file]->frames+1,LIVES_FILE_EXT_SCRAP);
 
   char *framecount;
 
@@ -5391,7 +5408,7 @@
 
   sfile->clip_type=CLIP_TYPE_FILE;
   get_mime_type(sfile->type,40,cdata);
-  if (!strcmp(prefs->image_ext,"png")) sfile->img_type=IMG_TYPE_PNG; // read_headers() will have set this to "jpeg" (default)
+  if (!strcmp(prefs->image_ext,LIVES_FILE_EXT_PNG)) sfile->img_type=IMG_TYPE_PNG; // read_headers() will have set this to "jpeg" (default)
   // we will set correct value in check_clip_integrity() if there are any real images
 
   if (sfile->ext_src!=NULL) {

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

@@ -384,15 +384,14 @@
 
   }
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  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);
-  lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
+  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);
@@ -557,7 +556,7 @@
   label=lives_standard_label_new(_("LiVES will now run some basic configuration tests\n"));
   lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
 
-  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  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);
 
@@ -565,9 +564,8 @@
                                LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   if (!tshoot) {
-    okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
-    lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
-  } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    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);
@@ -602,7 +600,7 @@
   add_test(table,1,_("Checking if sox can convert audio"),success);
 
   if (!tshoot) set_pref("default_image_format","png");
-  lives_snprintf(prefs->image_ext,16,"%s","png");
+  lives_snprintf(prefs->image_ext,16,"%s",LIVES_FILE_EXT_PNG);
 
   get_temp_handle(mainw->first_free_file,TRUE);
 
@@ -854,9 +852,9 @@
     if (res==0) {
       pass_test(table,5);
       if (!success3) {
-        if (!strcmp(prefs->image_ext,"png")) imgext_switched=TRUE;
+        if (!strcmp(prefs->image_ext,LIVES_FILE_EXT_PNG)) imgext_switched=TRUE;
         set_pref("default_image_format","jpeg");
-        lives_snprintf(prefs->image_ext,16,"%s","jpg");
+        lives_snprintf(prefs->image_ext,16,"%s",LIVES_FILE_EXT_JPG);
       }
     } else {
       if (!success3) fail_test(table,5,_("You should install mplayer with either png/alpha or jpeg support"));
@@ -967,8 +965,7 @@
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton1),TRUE);
   }
 
-  okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
-  lives_button_set_label(LIVES_BUTTON(okbutton),_("_Finish"));
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD,_("_Finish"));
 
   lives_widget_show(okbutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);

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

@@ -1401,9 +1401,9 @@
 LIVES_INLINE const char *get_image_ext_for_type(lives_image_type_t imgtype) {
   switch (imgtype) {
   case IMG_TYPE_JPEG:
-    return "jpg";
+    return LIVES_FILE_EXT_JPG; // "jpg"
   case IMG_TYPE_PNG:
-    return "png";
+    return LIVES_FILE_EXT_PNG; // "png"
   default:
     return "";
   }
@@ -2225,6 +2225,10 @@
 
 
 
+LIVES_INLINE char *make_image_file_name(lives_clip_t *sfile, int frame, const char *img_ext) {
+  return lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,frame,img_ext);
+}
+
 
 boolean check_frame_count(int idx) {
   // check number of frames is correct
@@ -2236,8 +2240,7 @@
   // ingores gaps
 
   // make sure nth frame is there...
-  char *frame=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames,
-                                  get_image_ext_for_type(mainw->files[idx]->img_type));
+  char *frame=make_image_file_name(mainw->files[idx],mainw->files[idx]->frames,get_image_ext_for_type(mainw->files[idx]->img_type));
 
   if (!lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) {
     // not enough frames
@@ -2247,8 +2250,8 @@
   lives_free(frame);
 
   // ...make sure n + 1 th frame is not
-  frame=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames+1,
-                            get_image_ext_for_type(mainw->files[idx]->img_type));
+  frame=make_image_file_name(mainw->files[idx],mainw->files[idx]->frames+1,get_image_ext_for_type(mainw->files[idx]->img_type));
+
   if (lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) {
     // too many frames
     lives_free(frame);
@@ -3405,12 +3408,14 @@
       jack_close_device(mainw->jackd);
       mainw->jackd=NULL;
     }
-#endif
 
     if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
       jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
     }
 
+
+#endif
+
     return retval;
   }
 
@@ -3852,7 +3857,18 @@
   // sometimes the clip menu gets messed up, e.g. after reloading a set.
   // This function will clean up the 'x's and so on.
 
+  register int i;
+
   if (mainw->current_file>0&&cfile!=NULL&&cfile->menuentry!=NULL) {
+#ifdef GTK_RADIO_MENU_BUG
+    for (i=1; i<MAX_FILES; i++) {
+      if (i!=mainw->current_file&&mainw->files[i]!=NULL&&mainw->files[i]->menuentry!=NULL) {
+        lives_signal_handler_block(mainw->files[i]->menuentry, mainw->files[i]->menuentry_func);
+        lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->files[i]->menuentry), FALSE);
+        lives_signal_handler_unblock(mainw->files[i]->menuentry, mainw->files[i]->menuentry_func);
+      }
+    }
+#endif
     lives_signal_handler_block(cfile->menuentry, cfile->menuentry_func);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(cfile->menuentry), TRUE);
     lives_signal_handler_unblock(cfile->menuentry, cfile->menuentry_func);
@@ -4296,8 +4312,7 @@
 }
 
 
-void
-set_sel_label(LiVESWidget *sel_label) {
+void set_sel_label(LiVESWidget *sel_label) {
   char *tstr,*frstr,*tmp;
   char *sy,*sz;
 
@@ -5288,11 +5303,13 @@
   fcount=cfile->frames;
 
   for (i=1; i<=fcount; i++) {
-    fname_next=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,i,prefs->image_ext);
+    fname_next=make_image_file_name(cfile,i,prefs->image_ext);
     if (sget_file_size(fname_next)>0) {
+      lives_free(fname_next);
       maybeok=TRUE;
       break;
     }
+    lives_free(fname_next);
   }
 
   cfile->frames=ofcount;

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

@@ -449,7 +449,7 @@
 
 
 
-void on_open_vdev_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+boolean on_open_vdev_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   unicap_device_t devices[MAX_DEVICES];
 
   LiVESList *devlist=NULL;
@@ -476,7 +476,7 @@
 
   if (dev_count == 0) {
     do_no_in_vdevs_error();
-    return;
+    return FALSE;
   }
 
   // get device list
@@ -496,21 +496,32 @@
 
   if (devlist==NULL) {
     do_locked_in_vdevs_error();
-    return;
+    return FALSE;
   }
 
-  mainw->fx1_val=0;
-  mainw->open_deint=FALSE;
-  card_dialog=create_combo_dialog(1,(livespointer)devlist);
-  response=lives_dialog_run(LIVES_DIALOG(card_dialog));
-  lives_list_free(devlist);
+  if (user_data==NULL) {
+    mainw->fx1_val=0;
+    mainw->open_deint=FALSE;
+    card_dialog=create_combo_dialog(1,(livespointer)devlist);
+    response=lives_dialog_run(LIVES_DIALOG(card_dialog));
+    lives_list_free(devlist);
+
+    if (response==LIVES_RESPONSE_CANCEL) {
+      lives_widget_destroy(card_dialog);
+      return FALSE;
+    }
 
-  if (response==LIVES_RESPONSE_CANCEL) {
     lives_widget_destroy(card_dialog);
-    return;
+  } else {
+    char *device=(char *)user_data;
+    for (i=0; i<dev_count; i++) {
+      if (!strcmp(device,devices[i].device)) {
+        mainw->fx1_val=i;
+        break;
+      }
+    }
   }
 
-  lives_widget_destroy(card_dialog);
 
   for (i=dev_count-1; i>=0; i--) {
     if (!unicap_is_stream_locked(&devices[i])) {
@@ -527,7 +538,7 @@
 
   if (!get_new_handle(new_file,fname)) {
     lives_free(fname);
-    return;
+    return FALSE;
   }
 
   mainw->current_file=new_file;
@@ -539,7 +550,7 @@
     d_print(_("Unable to open device %s\n"),fname);
     lives_free(fname);
     close_current_file(old_file);
-    return;
+    return FALSE;
   }
 
   if (cfile->interlace!=LIVES_INTERLACE_NONE&&prefs->auto_deint) cfile->deinterlace=TRUE; ///< auto deinterlace
@@ -553,10 +564,11 @@
 
   d_print(_("Opened device %s\n"),devices[devno].identifier);
 
-  switch_to_file((mainw->current_file=old_file),new_file);
+  switch_clip(0,new_file,TRUE);
 
   lives_free(fname);
 
+  return TRUE;
 }

LiVES-2.4.1.tar.bz2/src/videodev.h -> LiVES-2.4.2.tar.bz2/src/videodev.h Changed

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

@@ -11,6 +11,11 @@
 
 #ifdef GUI_GTK
 
+
+#define GTK_RADIO_MENU_BUG // a bug where gtk_radio_menu_item_set_active() does not update visually
+
+
+
 #ifndef IS_MINGW
 typedef gboolean                          boolean;
 #endif
@@ -846,6 +851,7 @@
 #define LIVES_STOCK_MEDIA_PLAY "media-playback-start"
 #define LIVES_STOCK_MEDIA_STOP "media-playback-stop"
 #define LIVES_STOCK_MEDIA_REWIND "media-seek-backward"
+#define LIVES_STOCK_MEDIA_FORWARD "media-seek-forward"
 #define LIVES_STOCK_MEDIA_RECORD "media-record"
 #define LIVES_STOCK_MEDIA_PAUSE "media-pause"
 #define LIVES_STOCK_PREFERENCES "preferences-system"
@@ -867,6 +873,13 @@
 char LIVES_STOCK_LABEL_DELETE[32];
 char LIVES_STOCK_LABEL_GO_FORWARD[32];
 
+char LIVES_STOCK_LABEL_MEDIA_FORWARD[32];
+char LIVES_STOCK_LABEL_MEDIA_REWIND[32];
+char LIVES_STOCK_LABEL_MEDIA_STOP[32];
+char LIVES_STOCK_LABEL_MEDIA_PLAY[32];
+char LIVES_STOCK_LABEL_MEDIA_PAUSE[32];
+char LIVES_STOCK_LABEL_MEDIA_RECORD[32];
+
 
 #else
 #define LIVES_STOCK_UNDO GTK_STOCK_UNDO
@@ -900,11 +913,55 @@
 #define LIVES_STOCK_LABEL_SAVE GTK_STOCK_SAVE
 #define LIVES_STOCK_LABEL_QUIT GTK_STOCK_QUIT
 
+
+#if GTK_CHECK_VERSION(2,6,0)
+#define LIVES_STOCK_LABEL_MEDIA_FORWARD GTK_STOCK_MEDIA_FORWARD
+#define LIVES_STOCK_LABEL_MEDIA_REWIND GTK_STOCK_MEDIA_REWIND
+#define LIVES_STOCK_LABEL_MEDIA_STOP GTK_STOCK_MEDIA_STOP
+#define LIVES_STOCK_LABEL_MEDIA_PLAY GTK_STOCK_MEDIA_PLAY
+#define LIVES_STOCK_LABEL_MEDIA_PAUSE GTK_STOCK_MEDIA_PAUSE
+#define LIVES_STOCK_LABEL_MEDIA_RECORD GTK_STOCK_MEDIA_RECORD
+#else
+#define LIVES_STOCK_LABEL_MEDIA_FORWARD GTK_STOCK_GOTO_LAST
+#define LIVES_STOCK_LABEL_MEDIA_REWIND GTK_STOCK_GOTO_FIRST
+#define LIVES_STOCK_LABEL_MEDIA_STOP GTK_STOCK_NO
+#define LIVES_STOCK_LABEL_MEDIA_PLAY GTK_STOCK_GO_FORWARD
+#define LIVES_STOCK_LABEL_MEDIA_PAUSE GTK_STOCK_REFRESH
+#define LIVES_STOCK_LABEL_MEDIA_RECORD GTK_STOCK_NO
+#endif
+
+
+#if GTK_CHECK_VERSION(2,6,0)
 #define LIVES_STOCK_MEDIA_PAUSE GTK_STOCK_MEDIA_PAUSE
+#else
+#define LIVES_STOCK_MEDIA_PAUSE GTK_STOCK_REFRESH
+#endif
+
+#if GTK_CHECK_VERSION(2,6,0)
 #define LIVES_STOCK_MEDIA_PLAY GTK_STOCK_MEDIA_PLAY
+#else
+#define LIVES_STOCK_MEDIA_PLAY GTK_STOCK_GO_FORWARD
+#endif
+#if GTK_CHECK_VERSION(2,6,0)
 #define LIVES_STOCK_MEDIA_STOP GTK_STOCK_MEDIA_STOP
+#else
+#define LIVES_STOCK_MEDIA_STOP GTK_STOCK_STOP
+#endif
+#if GTK_CHECK_VERSION(2,6,0)
 #define LIVES_STOCK_MEDIA_REWIND GTK_STOCK_MEDIA_REWIND
+#else
+#define LIVES_STOCK_MEDIA_REWIND GTK_STOCK_GOTO_FIRST
+#endif
+#if GTK_CHECK_VERSION(2,6,0)
+#define LIVES_STOCK_MEDIA_FORWARD GTK_STOCK_MEDIA_FORWARD
+#else
+#define LIVES_STOCK_MEDIA_FORWARD GTK_STOCK_GOTO_LAST
+#endif
+#if GTK_CHECK_VERSION(2,6,0)
 #define LIVES_STOCK_MEDIA_RECORD GTK_STOCK_MEDIA_RECORD
+#else
+#define LIVES_STOCK_MEDIA_RECORD GTK_STOCK_NO
+#endif
 
 #endif

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

@@ -814,6 +814,7 @@
 
 
 LIVES_INLINE boolean lives_widget_set_app_paintable(LiVESWidget *widget, boolean paintable) {
+  return TRUE;
 #ifdef GUI_GTK
   gtk_widget_set_app_paintable(widget,paintable);
   return TRUE;
@@ -2394,6 +2395,9 @@
   LiVESWidget *expander=NULL;
 #ifdef GUI_GTK
   expander=gtk_expander_new_with_mnemonic(label);
+#if GTK_CHECK_VERSION(3,2,0)
+  gtk_expander_set_resize_toplevel(GTK_EXPANDER(expander),TRUE);
+#endif
 #endif
   return expander;
 }
@@ -2404,6 +2408,9 @@
   LiVESWidget *expander=NULL;
 #ifdef GUI_GTK
   expander=gtk_expander_new(label);
+#if GTK_CHECK_VERSION(3,2,0)
+  gtk_expander_set_resize_toplevel(GTK_EXPANDER(expander),TRUE);
+#endif
 #endif
   return expander;
 }
@@ -2938,6 +2945,7 @@
   LiVESWidget *button=NULL;
 #ifdef GUI_GTK
   button=gtk_button_new();
+  gtk_button_set_use_underline(GTK_BUTTON(button),TRUE);
 #endif
 #ifdef GUI_QT
   button = new LiVESButton;
@@ -2974,7 +2982,7 @@
 }
 
 
-LIVES_INLINE LiVESWidget *lives_button_new_from_stock(const char *stock_id) {
+LIVES_INLINE LiVESWidget *lives_button_new_from_stock(const char *stock_id, const char *label) {
   LiVESWidget *button=NULL;
 
 #if GTK_CHECK_VERSION(3,10,0) || defined GUI_QT
@@ -3010,6 +3018,18 @@
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_QUIT);
   } else if (!strcmp(stock_id,LIVES_STOCK_GO_FORWARD)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_GO_FORWARD);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_FORWARD)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_FORWARD);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_REWIND)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_REWIND);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_STOP)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_STOP);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_PLAY)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_PLAY);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_PAUSE)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_PAUSE);
+  } else if (!strcmp(stock_id,LIVES_STOCK_MEDIA_RECORD)) {
+    button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_MEDIA_RECORD);
   } else {
     // text not known
     button=lives_button_new();
@@ -3047,8 +3067,11 @@
 #if GTK_CHECK_VERSION(3,6,0)
     gtk_button_set_always_show_image(GTK_BUTTON(button),prefs->show_button_images);
 #endif
+    if (label!=NULL)
+      gtk_button_set_label(GTK_BUTTON(button),label);
 #endif
 
+
     return button;
   }
 
@@ -5911,6 +5934,15 @@
 }
 
 
+LIVES_INLINE boolean lives_check_menu_item_set_draw_as_radio(LiVESCheckMenuItem *item, boolean setting) {
+#ifdef GUI_GTK
+  gtk_check_menu_item_set_draw_as_radio(item,setting);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
 LIVES_INLINE LiVESWidget *lives_image_menu_item_new_from_stock(const char *stock_id, LiVESAccelGroup *accel_group) {
   LiVESWidget *menuitem=NULL;
 #ifdef GUI_GTK
@@ -6261,6 +6293,22 @@
   return value;
 }
 
+LIVES_INLINE boolean lives_scale_button_set_value(LiVESScaleButton *scale, double value) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_scale_button_set_value(scale,value);
+#else
+  gtk_adjustment_set_value(gtk_range_get_adjustment(scale),value);
+#endif
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  value = scale->value();
+  return TRUE;
+#endif
+  return FALSE;
+}
+
 
 LIVES_INLINE char *lives_file_chooser_get_filename(LiVESFileChooser *chooser) {
   char *fname=NULL;
@@ -7534,8 +7582,8 @@
 
   if (add_std_buttons) {
     LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
-    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
-    LiVESWidget *okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL);
+    LiVESWidget *okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL);
 
     lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
@@ -7741,6 +7789,12 @@
   lives_snprintf(LIVES_STOCK_LABEL_REFRESH,32,"%s",(_("_Refresh")));
   lives_snprintf(LIVES_STOCK_LABEL_DELETE,32,"%s",(_("_Delete")));
   lives_snprintf(LIVES_STOCK_LABEL_GO_FORWARD,32,"%s",(_("_Forward")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_FORWARD,32,"%s",(_("R_ewind")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_REWIND,32,"%s",(_("_Forward")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_PLAY,32,"%s",(_("_Play")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_PAUSE,32,"%s",(_("P_ause")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_STOP,32,"%s",(_("_Stop")));
+  lives_snprintf(LIVES_STOCK_LABEL_MEDIA_RECORD,32,"%s",(_("_Record")));
 #endif
 
   widget_opts = def_widget_opts;

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

@@ -193,7 +193,7 @@
 
 
 LiVESWidget *lives_button_new(void);
-LiVESWidget *lives_button_new_from_stock(const char *stock_id);
+LiVESWidget *lives_button_new_from_stock(const char *stock_id, const char *label);
 LiVESWidget *lives_button_new_with_label(const char *label);
 LiVESWidget *lives_button_new_with_mnemonic(const char *label);
 
@@ -552,6 +552,7 @@
 boolean lives_entry_set_has_frame(LiVESEntry *, boolean has);
 
 double lives_scale_button_get_value(LiVESScaleButton *);
+boolean lives_scale_button_set_value(LiVESScaleButton *, double value);
 
 LiVESWidget *lives_table_new(uint32_t rows, uint32_t cols, boolean homogeneous);
 boolean lives_table_set_row_spacings(LiVESTable *, uint32_t spacing);
@@ -602,6 +603,8 @@
 
 LiVESWidget *lives_check_menu_item_new_with_mnemonic(const char *label);
 LiVESWidget *lives_check_menu_item_new_with_label(const char *label);
+boolean lives_check_menu_item_set_draw_as_radio(LiVESCheckMenuItem *, boolean setting);
+
 LiVESWidget *lives_radio_menu_item_new_with_label(LiVESSList *group, const char *label);
 LiVESWidget *lives_image_menu_item_new_with_label(const char *label);
 LiVESWidget *lives_image_menu_item_new_with_mnemonic(const char *label);