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 19

LiVES.changes Changed

LiVES.spec Changed

LiVES-2.0.3.tar.bz2/ChangeLog -> LiVES-2.0.4.tar.bz2/ChangeLog Changed

LiVES-2.0.3.tar.bz2/LiVES.doxygen -> LiVES-2.0.4.tar.bz2/LiVES.doxygen Changed

LiVES-2.0.3.tar.bz2/README -> LiVES-2.0.4.tar.bz2/README Changed

LiVES-2.0.3.tar.bz2/build-lives-rfx-plugin -> LiVES-2.0.4.tar.bz2/build-lives-rfx-plugin Changed

LiVES-2.0.3.tar.bz2/configure -> LiVES-2.0.4.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for LiVES 2.0.3.
+# Generated by GNU Autoconf 2.68 for LiVES 2.0.4.
 #
 # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='LiVES'
 PACKAGE_TARNAME='lives'
-PACKAGE_VERSION='2.0.3'
-PACKAGE_STRING='LiVES 2.0.3'
+PACKAGE_VERSION='2.0.4'
+PACKAGE_STRING='LiVES 2.0.4'
 PACKAGE_BUGREPORT='http://www.sourceforge.net/tracker/?group_id=64341&atid=507139'
 PACKAGE_URL=''
 
@@ -1643,7 +1643,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.0.3 to adapt to many kinds of systems.
+\`configure' configures LiVES 2.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1714,7 +1714,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LiVES 2.0.3:";;
+     short | recursive ) echo "Configuration of LiVES 2.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1954,7 +1954,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LiVES configure 2.0.3
+LiVES configure 2.0.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2676,7 +2676,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.0.3, which was
+It was created by LiVES $as_me 2.0.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3608,7 +3608,7 @@
 
 # Define the identity of the package.
  PACKAGE='lives'
- VERSION='2.0.3'
+ VERSION='2.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -28481,7 +28481,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.0.3, which was
+This file was extended by LiVES $as_me 2.0.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28538,7 +28538,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.0.3
+LiVES config.status 2.0.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

LiVES-2.0.3.tar.bz2/configure.in -> LiVES-2.0.4.tar.bz2/configure.in Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/Makefile.am -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/Makefile.am Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/Makefile.in Changed

@@ -263,6 +263,9 @@
 posterise_la_LIBADD =
 posterise_la_SOURCES = posterise.c
 posterise_la_OBJECTS = posterise.lo
+revTV_la_LIBADD =
+revTV_la_SOURCES = revTV.c
+revTV_la_OBJECTS = revTV.lo
 rippleTV_la_LIBADD =
 rippleTV_la_SOURCES = rippleTV.c
 rippleTV_la_OBJECTS = rippleTV.lo
@@ -333,9 +336,9 @@
 	layout_blends.c libvis.c lifeTV.c livetext.c log_sig.c \
 	mirrors.c multi_blends.c multi_transitions.c negate.c \
 	nn_programmer.c noise.c onedTV.c palette_test.c plasma.c \
-	posterise.c rippleTV.c rotozoom.c shift.c simple_blend.c \
-	slide_over.c softlight.c targeted_zoom.c textfun.c tone_gen.c \
-	tvpic.c vertigo.c warpTV.c xeffect.c
+	posterise.c revTV.c rippleTV.c rotozoom.c shift.c \
+	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
+	textfun.c tone_gen.c tvpic.c vertigo.c warpTV.c xeffect.c
 DIST_SOURCES = RGBdelay.c alien_overlay.c alpha_means.c audio_fft.c \
 	audio_transition.c audio_volume.c beat_detector.c \
 	blank_frame_detector.c blurzoom.c bump2d.c ccorrect.c \
@@ -345,9 +348,9 @@
 	layout_blends.c libvis.c lifeTV.c livetext.c log_sig.c \
 	mirrors.c multi_blends.c multi_transitions.c negate.c \
 	nn_programmer.c noise.c onedTV.c palette_test.c plasma.c \
-	posterise.c rippleTV.c rotozoom.c shift.c simple_blend.c \
-	slide_over.c softlight.c targeted_zoom.c textfun.c tone_gen.c \
-	tvpic.c vertigo.c warpTV.c xeffect.c
+	posterise.c revTV.c rippleTV.c rotozoom.c shift.c \
+	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
+	textfun.c tone_gen.c tvpic.c vertigo.c warpTV.c xeffect.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -721,6 +724,7 @@
 	palette_test.la\
 	plasma.la \
 	posterise.la \
+	revTV.la \
 	rippleTV.la \
 	rotozoom.la \
 	shift.la \
@@ -1040,6 +1044,8 @@
 	$(LINK) -rpath $(fxpluginslibdir) $(plasma_la_OBJECTS) $(plasma_la_LIBADD) $(LIBS)
 posterise.la: $(posterise_la_OBJECTS) $(posterise_la_DEPENDENCIES) $(EXTRA_posterise_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(posterise_la_OBJECTS) $(posterise_la_LIBADD) $(LIBS)
+revTV.la: $(revTV_la_OBJECTS) $(revTV_la_DEPENDENCIES) $(EXTRA_revTV_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(revTV_la_OBJECTS) $(revTV_la_LIBADD) $(LIBS)
 rippleTV.la: $(rippleTV_la_OBJECTS) $(rippleTV_la_DEPENDENCIES) $(EXTRA_rippleTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(rippleTV_la_OBJECTS) $(rippleTV_la_LIBADD) $(LIBS)
 rotozoom.la: $(rotozoom_la_OBJECTS) $(rotozoom_la_DEPENDENCIES) $(EXTRA_rotozoom_la_DEPENDENCIES) 
@@ -1112,6 +1118,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette_test.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasma.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posterise.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revTV.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rippleTV.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotozoom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shift.Plo@am__quote@

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/blurzoom.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/blurzoom.c Changed

@@ -82,24 +82,33 @@
 
 
 
-/* Background image is refreshed every frame */
-static void image_bgsubtract_update_y(RGB32 *src, int width, int height, struct _sdata *sdata)
-{
-  register int R, G, B;
-  RGB32 *p,*end;
-  register short *q;
-  register unsigned char *r;
-  register int v;
-  int video_area=width*height;
+static void image_bgsubtract_update_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
+  register int i,j;
+  int R, G, B;
+  RGB32 *p;
+  short *q;
+  unsigned char *r;
+  int v;
   
+  rowstride-=width;
+
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  end=src+video_area;
-  for(p=src; p<end; p++) {
-    v= (R = ((*p)&0xff0000)>>(16-1)) + (G = ((*p)&0xff00)>>(8-2)) + (B = (*p)&0xff) - (int)(*q);
-    *(q++) = (short)(R + G + B);
-    *(r++) = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
+  for(i=0; i<height; i++) {
+    for (j=0;j<width;j++) {
+      R = ((*p)&0xff0000)>>(16-1);
+      G = ((*p)&0xff00)>>(8-2);
+      B = (*p)&0xff;
+      v = (R + G + B) - (int)(*q);
+      *q = (short)(R + G + B);
+      *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
+      
+      p++;
+      q++;
+      r++;
+    }
+    p+=rowstride;
   }
 }
 
@@ -368,16 +377,23 @@
 
 
 int blurzoom_process (weed_plant_t *inst, weed_timecode_t timecode) {
+  weed_plant_t *in_channel,*out_channel,*in_param;
+
   register int x, y;
   register RGB32 a, b;
+
   register unsigned char *diff, *p;
   
   RGB32 *src,*dest;
+
   struct _sdata *sdata;
-  int video_width,video_height,video_area;
+
+  size_t snap_offs=0,src_offs=0;
+
+  int video_width,video_height,video_area,irow,orow;
   int mode=0;
   int error;
-  weed_plant_t *in_channel,*out_channel,*in_param;
+
 
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
@@ -389,6 +405,9 @@
   video_width = weed_get_int_value(in_channel,"width",&error);
   video_height = weed_get_int_value(in_channel,"height",&error);
 
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
+
   video_area=video_width*video_height;
 
   diff=sdata->diff;
@@ -397,7 +416,7 @@
   mode=weed_get_int_value(in_param,"value",&error);
 
   if(mode != 2 || sdata->snapTime <= 0) {
-    image_bgsubtract_update_y(src,video_width,video_height,sdata);
+    image_bgsubtract_update_y(src,video_width,video_height,irow,sdata);
     if(mode == 0 || sdata->snapTime <= 0) {
       diff += sdata->buf_margin_left;
       p = sdata->blurzoombuf;
@@ -409,13 +428,20 @@
 	p += sdata->buf_width;
       }
       if(mode == 1 || mode == 2) {
-	weed_memcpy(sdata->snapframe, src, video_area * PIXEL_SIZE);
+	for (x=0;x<video_height;x++) {
+	  weed_memcpy(sdata->snapframe+snap_offs, src+src_offs, video_width * PIXEL_SIZE);
+	  snap_offs+=video_width;
+	  src_offs+=irow;
+	}
       }
     }
   }
 
   blurzoomcore(sdata);
   
+  irow-=video_width;
+  orow-=video_width;
+
   if(mode == 1 || mode == 2) {
     src = sdata->snapframe;
   }
@@ -434,6 +460,10 @@
     for(x=0; x<sdata->buf_margin_right; x++) {
       *dest++ = *src++;
     }
+
+    src+=irow;
+    dest+=orow;
+
   }
   
   if(mode == 1 || mode == 2) {

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/fireTV.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/fireTV.c Changed

@@ -112,30 +112,35 @@
 }
 
 
-static void image_bgsubtract_y(RGB32 *src, int width, int height, struct _sdata *sdata)
-{
-  register int i;
+static void image_bgsubtract_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
+  register int i,j;
   int R, G, B;
   RGB32 *p;
   short *q;
   unsigned char *r;
   int v;
-  int video_area=width*height;
   
+  rowstride-=width;
+
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<video_area; i++) {
-    R = ((*p)&0xff0000)>>(16-1);
-    G = ((*p)&0xff00)>>(8-2);
-    B = (*p)&0xff;
-    v = (R + G + B) - (int)(*q);
-    *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-    
-    p++;
-    q++;
-    r++;
+  for(i=0; i<height; i++) {
+    for (j=0;j<width;j++) {
+      R = ((*p)&0xff0000)>>(16-1);
+      G = ((*p)&0xff00)>>(8-2);
+      B = (*p)&0xff;
+      v = (R + G + B) - (int)(*q);
+      *q = (short)(R + G + B);
+      *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
+      
+      p++;
+      q++;
+      r++;
+    }
+    p+=rowstride;
   }
+
   
   /* The origin of subtraction function is;
    * diff(src, dest) = (abs(src - dest) > threshold) ? 0xff : 0;
@@ -213,16 +218,20 @@
 
 
 int fire_process (weed_plant_t *inst, weed_timecode_t timestamp) {
-  RGB32 *src,*dest;
   struct _sdata *sdata;
-  int video_width,video_height;
-  register int i, x, y;
-  unsigned char v;
-  int video_area;
 
+  unsigned char v;
   weed_plant_t *in_channel,*out_channel;
+
+  RGB32 *src,*dest;
+
+  int video_width,video_height,irow,orow;
+  int video_area;
   int error;
 
+  register int i, x, y;
+
+
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
@@ -233,10 +242,14 @@
   video_width = weed_get_int_value(in_channel,"width",&error);
   video_height = weed_get_int_value(in_channel,"height",&error);
 
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
+
   video_area=video_width*video_height;
   sdata->fastrand_val=timestamp&0x0000FFFF;
 
-  image_bgsubtract_y(src,video_width,video_height,sdata);
+  image_bgsubtract_y(src,video_width,video_height,irow,sdata);
+
   for(i=0; i<video_area-video_width; i++) {
     sdata->buffer[i] |= sdata->diff[i];
   }
@@ -251,9 +264,9 @@
       i += video_width;
     }
   }
-  for(y=0; y<video_area; y+=video_width) {
+  for(y=0; y<video_height; y++) {
     for(x=1; x<video_width-1; x++) {
-      dest[y+x] = (src[y+x]&0xff000000)|palette[sdata->buffer[y+x]];
+      dest[y*orow+x] = (src[y*irow+x]&0xff000000)|palette[sdata->buffer[y*video_width+x]];
     }
   }

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/lifeTV.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/lifeTV.c Changed

@@ -64,29 +64,33 @@
 
 
 /* Background image is refreshed every frame */
-static void image_bgsubtract_update_y(RGB32 *src, int width, int height, struct _sdata *sdata) {
-  register int i;
+static void image_bgsubtract_update_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
+  register int i,j;
   int R, G, B;
   RGB32 *p;
   short *q;
   unsigned char *r;
   int v;
-  int video_area=width*height;
   
+  rowstride-=width;
+
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<video_area; i++) {
-    R = ((*p)&0xff0000)>>(16-1);
-    G = ((*p)&0xff00)>>(8-2);
-    B = (*p)&0xff;
-    v = (R + G + B) - (int)(*q);
-    *q = (short)(R + G + B);
-    *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-    
-    p++;
-    q++;
-    r++;
+  for(i=0; i<height; i++) {
+    for (j=0;j<width;j++) {
+      R = ((*p)&0xff0000)>>(16-1);
+      G = ((*p)&0xff00)>>(8-2);
+      B = (*p)&0xff;
+      v = (R + G + B) - (int)(*q);
+      *q = (short)(R + G + B);
+      *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
+      
+      p++;
+      q++;
+      r++;
+    }
+    p+=rowstride;
   }
 }
 
@@ -210,16 +214,21 @@
 
 
 int lifetv_process (weed_plant_t *inst, weed_timecode_t timestamp) {
-  int x, y;
+  struct _sdata *sdata;
+
+  weed_plant_t *in_channel,*out_channel;
+
   unsigned char *p, *q, v;
   unsigned char sum, sum1, sum2, sum3;
+
+  RGB32 *src,*dest;
+
   RGB32 pix;
   
-  RGB32 *src,*dest;
-  struct _sdata *sdata;
-  int width,height,video_area;
+  int width,height,video_area,irow,orow;
   int error;
-  weed_plant_t *in_channel,*out_channel;
+  register int x, y;
+
 
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
@@ -231,12 +240,17 @@
   width = weed_get_int_value(in_channel,"width",&error);
   height = weed_get_int_value(in_channel,"height",&error);
 
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4-width;
+
   video_area=width*height;
 
-  image_bgsubtract_update_y(src,width,height,sdata);
+  image_bgsubtract_update_y(src,width,height,irow,sdata);
   image_diff_filter(sdata,width,height);
   p=sdata->diff2;
 
+  irow-=width;
+
   for(x=0; x<video_area; x++) {
     sdata->field1[x] |= p[x];
   }
@@ -264,8 +278,8 @@
     }
     p += 2;
     q += 2;
-    src += 2;
-    dest += 2;
+    src += 2+irow;
+    dest += 2+orow;
   }
   p = sdata->field1;
   sdata->field1 = sdata->field2;

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/onedTV.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/onedTV.c Changed

@@ -49,6 +49,13 @@
 
 typedef unsigned int RGB32;
 
+static int is_big_endian() {
+  int32_t testint = 0x12345678;
+  char *pMem;
+  pMem = (char *) &testint;
+  if (pMem[0] == 0x78) return 0;
+  return 1;
+}
 
 struct _sdata {
   int line;
@@ -80,6 +87,8 @@
   }
 
   weed_memset(sdata->linebuf, 0, map_w*map_h*sizeof(RGB32));
+
+
   sdata->line = 0;
 
   weed_set_voidptr_value(inst,"plugin_internal",sdata);
@@ -103,41 +112,52 @@
 
 
 
-static void blitline(RGB32 *src,RGB32 *dest, int video_width, struct _sdata *sdata)
-{
-  src += video_width * sdata->line;
+static void blitline(RGB32 *src, RGB32 *dest, int video_width, int irow, struct _sdata *sdata) {
+  src += irow  * sdata->line;
   dest += video_width * sdata->line;
   weed_memcpy(dest, src, sizeof(RGB32) * video_width);
 }
 
 
 int oned_process (weed_plant_t *inst, weed_timecode_t timestamp) {
-  RGB32 *src,*dest;
+  weed_plant_t *in_channel,*out_channel;
   struct _sdata *sdata;
-  int width,height;
-  register int i;
+  RGB32 *src,*odest,*dest;
+
+  size_t offs=0;
 
+  int width,height,irow,orow;
   int error;
-  weed_plant_t *in_channel,*out_channel;
+
+  register int i;
+
 
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
 
   src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
-  dest=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+  odest=dest=weed_get_voidptr_value(out_channel,"pixel_data",&error);
 
   width = weed_get_int_value(in_channel,"width",&error);
   height = weed_get_int_value(in_channel,"height",&error);
 
-  blitline(src,sdata->linebuf,width,sdata);
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
+
+  blitline(src,sdata->linebuf,width,irow,sdata);
+
   sdata->line++;
   if(sdata->line >= height)
     sdata->line = 0;
 
-  weed_memcpy(dest,sdata->linebuf,width*height*sizeof(RGB32));
+  for (i=0;i<height;i++) {
+    weed_memcpy(dest,sdata->linebuf+offs,width*4);
+    dest+=orow;
+    offs+=width;
+  }
 
-  dest += width * sdata->line;
+  dest = odest + orow * sdata->line;
   for(i=0; i<width; i++) {
     dest[i] = 0xff00ff00;
   }

LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/revTV.c Added

@@ -0,0 +1,141 @@
+/*
+ * EffecTV - Realtime Digital Video Effector
+ * Copyright (C) 2001-2005 FUKUCHI Kentaro
+ *
+ */
+
+/* modified for Weed by G. Finch (salsaman)
+   modifications (c) G. Finch */
+
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=2; // number of different weed api versions supported
+static int api_versions[]={131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+int revtv_process (weed_plant_t *inst, weed_timecode_t timecode) {
+  weed_plant_t *in_channel,*out_channel,**in_params;
+  unsigned char *osrc,*src,*dest;
+
+  short val;
+
+  int yval;
+
+  int offset;
+
+  int width,height,irow,orow,pal;
+  int error;
+
+  int red=0,green=1,blue=2;
+  int psize=4;
+
+  int linespace;
+  double vscale;
+
+  register int x, y;
+  
+  in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+
+  osrc=src=(unsigned char *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+  dest=(unsigned char *)weed_get_voidptr_value(out_channel,"pixel_data",&error);
+
+  width = weed_get_int_value(in_channel,"width",&error);
+  height = weed_get_int_value(in_channel,"height",&error);
+
+  pal = weed_get_int_value(in_channel,"current_palette",&error);
+
+  irow = weed_get_int_value(in_channel,"rowstrides",&error);
+  orow = weed_get_int_value(out_channel,"rowstrides",&error);
+
+  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  linespace=weed_get_int_value(in_params[0],"value",&error);
+  vscale=weed_get_double_value(in_params[1],"value",&error);
+  vscale=vscale*vscale/200.;
+  weed_free(in_params);
+
+  if (pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_BGRA32) {
+    red=2;
+    blue=0;
+  }
+  else if (pal==WEED_PALETTE_ARGB32) {
+    red=1;
+    green=2;
+    blue=3;
+  }
+
+  if (pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_YUV888) {
+    psize=3;
+  }
+
+  width*=psize;
+
+  irow*=linespace;
+
+  for (y=0;y<height;y+=linespace) {
+    for (x=0;x<width;x+=psize) {
+      if (pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) val=src[0]*7;
+      else val=(short)((src[red]<<1)+(src[green]<<2)+src[blue]);
+      yval=y-val*vscale;
+      if ((offset=yval*orow+x)>=0) weed_memcpy(&dest[offset],src,psize);
+      src+=psize;
+    }
+    src+=irow-width;
+  }
+  
+  return WEED_NO_ERROR;
+}
+
+
+
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    int palette_list[]={WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_RGB24,WEED_PALETTE_BGR24,WEED_PALETTE_ARGB32,WEED_PALETTE_YUV888,WEED_PALETTE_YUVA8888,WEED_PALETTE_END};
+
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
+    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",0,palette_list),NULL};
+    weed_plant_t *in_params[]={weed_integer_init("lspace","_Line spacing",6,1,16),weed_float_init("vscale","_Vertical scale factor",2.,0.,4.),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("revTV","effectTV",1,0,NULL,&revtv_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/rippleTV.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/rippleTV.c Changed

@@ -89,52 +89,59 @@
 
 
 
-static void image_bgset_y(RGB32 *src, int width, int height, struct _sdata *sdata)
+static void image_bgset_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
 {
-  register int i;
+  register int i,j;
   int R, G, B;
   RGB32 *p;
   short *q;
-  int video_area=width*height;
+
+  rowstride-=width;
 
   p = src;
   q = sdata->background;
-  for(i=0; i<video_area; i++) {
-    R = ((*p)&0xff0000)>>(16-1);
-    G = ((*p)&0xff00)>>(8-2);
-    B = (*p)&0xff;
-    *q = (short)(R + G + B);
-    p++;
-    q++;
+  for(i=0; i<height; i++) {
+    for (j=0;j<width;j++) {
+      R = ((*p)&0xff0000)>>(16-1);
+      G = ((*p)&0xff00)>>(8-2);
+      B = (*p)&0xff;
+      *q = (short)(R + G + B);
+      p++;
+      q++;
+    }
+    p+=rowstride;
   }
 }
 
 
 /* Background image is refreshed every frame */
-static void image_bgsubtract_update_y(RGB32 *src, int width, int height, struct _sdata *sdata)
-{
-  register int i;
+static void image_bgsubtract_update_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
+  register int i,j;
   int R, G, B;
   RGB32 *p;
   short *q;
   unsigned char *r;
   int v;
-  int video_area=width*height;
   
+  rowstride-=width;
+
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<video_area; i++) {
-    R = ((*p)&0xff0000)>>(16-1);
-    G = ((*p)&0xff00)>>(8-2);
-    B = (*p)&0xff;
-    v = (R + G + B) - (int)(*q);
-    *q = (short)(R + G + B);
-    *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-    
-    p++;
-    q++;
-    r++;
+  for(i=0; i<height; i++) {
+    for (j=0;j<width;j++) {
+      R = ((*p)&0xff0000)>>(16-1);
+      G = ((*p)&0xff00)>>(8-2);
+      B = (*p)&0xff;
+      v = (R + G + B) - (int)(*q);
+      *q = (short)(R + G + B);
+      *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
+      
+      p++;
+      q++;
+      r++;
+    }
+    p+=rowstride;
   }
 }
 
@@ -162,9 +169,9 @@
   }
 }
 
-static int setBackground(RGB32 *src, int width, int height, struct _sdata *sdata)
+static int setBackground(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
 {
-  image_bgset_y(src, width, height, sdata);
+  image_bgset_y(src, width, height, rowstride, sdata);
   sdata->bgIsSet = 1;
   
   return 0;
@@ -249,7 +256,7 @@
 }
 
 
-static void motiondetect(RGB32 *src, int width, int height, struct _sdata *sdata)
+static void motiondetect(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
 {
   unsigned char *diff;
   int *p, *q;
@@ -257,9 +264,9 @@
   int h;
   
   if(!sdata->bgIsSet) {
-    setBackground(src,width,height,sdata);
+    setBackground(src,width,height,rowstride,sdata);
   }
-  image_bgsubtract_update_y(src,width,height,sdata);
+  image_bgsubtract_update_y(src,width,height,rowstride,sdata);
 
   diff = sdata->diff;
   p = sdata->map1+width+1;
@@ -401,7 +408,7 @@
   irowstride=weed_get_int_value(in_channel,"rowstrides",&error)/4;
   orowstridex=orowstride=weed_get_int_value(out_channel,"rowstrides",&error)/4;
 
-  if (width%2!=0) orowstridex--;
+  //if (width%2!=0) orowstridex--;
 
   sdata->fastrand_val=timestamp&0x0000FFFF;
   in_param=weed_get_plantptr_value(inst,"in_parameters",&error);
@@ -411,7 +418,7 @@
   if(mode) {
     raindrop(width,height,sdata);
   } else {
-    motiondetect(src,width,height,sdata);
+    motiondetect(src,width,height,irowstride,sdata);
   }
   
   /* simulate surface wave */
@@ -494,7 +501,7 @@
       dx = x + 1 + (h+(int)vp[2])/2;
       if(dx<0) dx=0;
       if(dx>=width) dx=width-1;
-      dest[1] = src[dy*width+dx];
+      dest[1] = src[dy*irowstride+dx];
       
       dy = y + 1 + (v+(int)vp[width*2+1])/2;
       if(dy<0) dy=0;

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/rotozoom.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/rotozoom.c Changed

@@ -53,8 +53,8 @@
 
   register int i,j;
 
-  orowstride/=psize;
-  irowstride-=video_width*psize;
+  irowstride/=psize;
+  orowstride-=video_width*psize;
 
   xd = (stepx * zoom) >> 12;
   yd = (stepy * zoom) >> 12;
@@ -82,13 +82,13 @@
 
       //       a*=video_width/64;
       //      b*=video_height/64;
-      origin=(b*orowstride+a)*psize;
+      origin=(b*irowstride+a)*psize;
 
       weed_memcpy(dst,&src[origin],psize);
       dst+=psize;
       x += xd; y += yd;
     }
-    dst+=irowstride;
+    dst+=orowstride;
     sx -= yd; sy += xd;
   }
 }
@@ -160,6 +160,8 @@
   if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||
       palette==WEED_PALETTE_YUVA8888||palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) psize=4;
 
+  if (palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) width>>=1; // 2 pixels per macropixel
+
   draw_tile(roto[path], roto[(path + 128) & 0xFF],zoom,src,dst,width,irowstride,orowstride,height,dheight,offset,psize);
 
   weed_set_int_value(inst,"plugin_path",(path - 1) & 255);

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/vertigo.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/vertigo.c Changed

@@ -156,19 +156,24 @@
 
 
 int vertigo_process (weed_plant_t *inst, weed_timecode_t timecode) {
-  RGB32 *src,*dest;
   struct _sdata *sdata;
-  int video_width,video_height,video_area;
-  int error;
   weed_plant_t *in_channel,*out_channel,**in_params;
 
   double pinc,zoomrate;
 
+  size_t offs=0;
+
   RGB32 *p;
   RGB32 v;
-  int x, y;
+  RGB32 *src,*dest;
+
+  int video_width,video_height,video_area,irow,orow;
+  int error;
+
   int ox, oy;
   int i;
+
+  register int x, y;
   
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
@@ -180,6 +185,9 @@
   video_width = weed_get_int_value(in_channel,"width",&error);
   video_height = weed_get_int_value(in_channel,"height",&error);
 
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4-video_width;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
+
   video_area=video_width*video_height;
   
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
@@ -188,6 +196,7 @@
   weed_free(in_params);
 
   setParams(video_width,video_height,sdata,pinc,zoomrate);
+
   p = sdata->alt_buffer;
   for(y=video_height; y>0; y--) {
     ox = sdata->sx;
@@ -200,12 +209,18 @@
       ox += sdata->dx;
       oy += sdata->dy;
     }
+
+    src+=irow;
     sdata->sx -= sdata->dy;
     sdata->sy += sdata->dx;
   }
   
-  weed_memcpy(dest, sdata->alt_buffer, video_area*PIXEL_SIZE);
-  
+  for(y=0; y<video_height; y++) {
+    weed_memcpy(dest, sdata->alt_buffer+offs, video_width*PIXEL_SIZE);
+    dest+=orow;
+    offs+=video_width;
+  }
+
   p = sdata->current_buffer;
   sdata->current_buffer = sdata->alt_buffer;
   sdata->alt_buffer = p;

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/warpTV.c -> LiVES-2.0.4.tar.bz2/lives-plugins/weed-plugins/warpTV.c Changed

@@ -63,7 +63,6 @@
 /////////////////////////////////
 
 struct _sdata {
-  int *offstable;
   Sint32 *disttable;
   Sint32 ctable[1024];
   Sint32 sintable[1024+256];
@@ -85,13 +84,6 @@
 }
 
 
-static void initOffsTable (struct _sdata *sdata, int width, int height) {
-  int y;
-	
-  for (y = 0; y < height; y++) {
-    sdata->offstable[y] = y * width;
-  }
-}
 
 
 static void initDistTable (struct _sdata *sdata, int width, int height) {
@@ -102,8 +94,8 @@
 double x,y,m;
 #endif
 
-  halfw = width>> 1;
-  halfh = height >> 1;
+  halfw = width/2.+.5;
+  halfh = height/2.+.5;
   
   distptr = sdata->disttable;
   
@@ -121,7 +113,7 @@
 }
 
 
-static void doWarp (int xw, int yw, int cw,RGB32 *src,RGB32 *dst, int width, int height, struct _sdata *sdata) {
+static void doWarp (int xw, int yw, int cw,RGB32 *src,RGB32 *dst, int width, int height, int irow, int orow, struct _sdata *sdata) {
   Sint32 c,i, x,y, dx,dy, maxx, maxy;
   Sint32 skip, *ctptr, *distptr;
   Uint32 *destptr;
@@ -130,7 +122,7 @@
   ctptr = sdata->ctable;
   distptr = sdata->disttable;
   destptr = dst;
-  skip = 0 ; /* video_width*sizeof(RGB32)/4 - video_width;; */
+  skip = orow-width;
   c = 0;
   for (x = 0; x < 512; x++) {
     i = (c >> 3) & 0x3FE;
@@ -142,7 +134,8 @@
   /*	printf("Forring\n"); */
   for (y = 0; y < height-1; y++) {
     for (x = 0; x < width; x++) {
-      i = *distptr++; 
+      i = *distptr;
+      distptr++;
       dx = sdata->ctable [i+1] + x; 
       dy = sdata->ctable [i] + y;	 
       
@@ -154,7 +147,7 @@
       else if (dy > maxy) dy = maxy; 
       /* 	   printf("f:%d\n",dy); */
       /*	   printf("%d\t%d\n",dx,dy); */
-      *destptr++ = src[sdata->offstable[dy]+dx]; 
+      *destptr++ = src[dy*irow+dx]; 
     }
     destptr += skip;
   }
@@ -179,20 +172,19 @@
   video_height=weed_get_int_value(in_channel,"height",&error);
   video_width=weed_get_int_value(in_channel,"width",&error);
 
-  sdata->offstable = (int *)weed_malloc (video_height * sizeof (int));      
-  if(sdata->offstable == NULL ) {
-    weed_free(sdata);
-    return WEED_ERROR_MEMORY_ALLOCATION;
-  }
+  video_width=video_width/2.+.5;
+  video_width*=2;
+
+  video_height=video_height/2.+.5;
+  video_height*=2;
+
   sdata->disttable = weed_malloc (video_width * video_height * sizeof (int));
   if(sdata->disttable == NULL ) {
-    weed_free(sdata->offstable);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
   initSinTable (sdata);
-  initOffsTable (sdata,video_width,video_height);
   initDistTable (sdata,video_width,video_height);
 
   sdata->tval=0;
@@ -208,7 +200,6 @@
   struct _sdata *sdata;
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   if (sdata != NULL) {
-    weed_free(sdata->offstable);
     weed_free(sdata->disttable);
     weed_free(sdata);
     weed_set_voidptr_value(inst,"plugin_internal",NULL);
@@ -218,12 +209,13 @@
 
 
 int warp_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  RGB32 *src,*dest;
+  struct _sdata *sdata;
+
   int error;
   int xw,yw,cw;
 
-  RGB32 *src,*dest;
-  struct _sdata *sdata;
-  int width,height;
+  int width,height,irow,orow;
 
   weed_plant_t *in_channel,*out_channel;
 
@@ -237,13 +229,17 @@
   width = weed_get_int_value(in_channel,"width",&error);
   height = weed_get_int_value(in_channel,"height",&error);
 
+  irow = weed_get_int_value(in_channel,"rowstrides",&error)/4;
+  orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
+
+
   xw  = (int) (sin((sdata->tval+100)*M_PI/128) * 30);
   yw  = (int) (sin((sdata->tval)*M_PI/256) * -35);
   cw  = (int) (sin((sdata->tval-70)*M_PI/64) * 50);
   xw += (int) (sin((sdata->tval-10)*M_PI/512) * 40);
   yw += (int) (sin((sdata->tval+30)*M_PI/512) * 40);	  
 
-  doWarp(xw,yw,cw,src,dest,width,height,sdata);
+  doWarp(xw,yw,cw,src,dest,width,height,irow,orow,sdata);
   sdata->tval = (sdata->tval+1) &511;
 
   return WEED_NO_ERROR;

LiVES-2.0.3.tar.bz2/po/ar.po -> LiVES-2.0.4.tar.bz2/po/ar.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "اختبار"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "إكتشاف ...بايثون..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "عدم إكتشاف ...بايثون..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "عدم إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,48 +276,48 @@
 "\n"
 "تقرير مدير النافذة كـ \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "إكتشاف عدد الشاشات %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/ca.po -> LiVES-2.0.4.tar.bz2/po/ca.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Comprova"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO S'HA DETECTAT..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NO S'HA DETECTAT..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NO S'HA DETECTAT..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NO S'HA DETECTAT..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,63 +276,63 @@
 "\n"
 "Administrador Finestra d'informes com \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre de monitors detectat: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/cs.po -> LiVES-2.0.4.tar.bz2/po/cs.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: LiVEScz\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -139,23 +139,23 @@
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -167,104 +167,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykryto..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python... nalezen..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python... NENALEZEN..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab... nalezen..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NENALEZEN..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo... nalezeno..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NENALEZENO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -275,63 +275,63 @@
 "\n"
 "Správcem oken je \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nalezených monitorů: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "malý endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "velký endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/da.po -> LiVES-2.0.4.tar.bz2/po/da.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -126,23 +126,23 @@
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -154,104 +154,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -259,198 +259,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/de_DE.po -> LiVES-2.0.4.tar.bz2/po/de_DE.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: Lives 0.9.5\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n"
@@ -138,23 +138,23 @@
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeit-Effekt Plugins..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Starte Jack Audio Server..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -166,104 +166,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Starte den Pulse Audio Server"
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...gefunden..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse Audio...NICHT GEFUNDEN..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -271,63 +271,63 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/en_GB.po -> LiVES-2.0.4.tar.bz2/po/en_GB.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-15 09:42+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Starting jack transport server..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Connecting to jack transport server..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -175,104 +175,104 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detected..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NOT DETECTED..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detected..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NOT DETECTED..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detected..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NOT DETECTED..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detected..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NOT DETECTED..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr "Windows version %04X"
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr "UNKNOWN - please patch me !"
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -283,48 +283,48 @@
 "\n"
 "Window manager reports as \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "number of monitors detected: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Number of CPUs detected: %d "
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d bits, %s)\n"

LiVES-2.0.3.tar.bz2/po/es.po -> LiVES-2.0.4.tar.bz2/po/es.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -145,23 +145,23 @@
 msgid "Test"
 msgstr "Prueba"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -173,104 +173,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NO DETECTADO..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NO DETECTADO..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NO DETECTADO\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... detectado..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NO DETECTADO..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO DETECTADO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python... detectado..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python... NO DETECTADO..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab... detectado..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NO DETECTADO..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo... detectado..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NO DETECTADO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -281,48 +281,48 @@
 "\n"
 "El gestor de ventanas se reporta como «%s»; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/et.po -> LiVES-2.0.4.tar.bz2/po/et.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Testi"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -273,198 +273,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/fi.po -> LiVES-2.0.4.tar.bz2/po/fi.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -146,23 +146,23 @@
 msgid "Test"
 msgstr "Kokeile"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -174,104 +174,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...EI HAVAITTU..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...havaittu..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...EI HAVAITTU..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...havaittu..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...EI HAVAITTU..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...havaittu..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...EI HAVAITTU..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...havaittu..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...EI HAVAITTU..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr "TUNTEMATON - ole hyvä ja korjaa minut !"
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -282,48 +282,48 @@
 "\n"
 "Ikkunointiohjelma ilmoitti olevansa \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "näyttöjä löydetty: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/fr.po -> LiVES-2.0.4.tar.bz2/po/fr.po Changed

@@ -10,7 +10,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Français <kwizart@gmail.com>\n"
@@ -145,23 +145,23 @@
 msgid "Test"
 msgstr "Essai"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des plugins d'effets en temps réel"
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Lancement du serveur de transport Jack..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport Jack..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -173,104 +173,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Verification des dépendances optionnelles:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer....détecté..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DÉTECTÉ..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...détecté..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DÉTECTÉ..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...détecté..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DÉTECTÉ..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...détecté\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DÉTECTÉ\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...détecté..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DÉTECTÉ..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...détecté..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DÉTECTÉ..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...détecté..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NON DÉTECTÉ..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...détecté..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NON DÉTECTÉ..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...détecté..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON DÉTECTÉ..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...détecté..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON DÉTECTÉ..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr "INCONNU - veuillez me corriger !"
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -281,48 +281,48 @@
 "\n"
 "Le gestionnaire de fenêtres apparaît comme étant  \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre d'écrans trouvés : %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/gl.po -> LiVES-2.0.4.tar.bz2/po/gl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Proba"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Comprobar dependencias opcionais:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...detectados..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTA..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detectados..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DETECTA..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DETECTA..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectados\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DETECTA\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectados..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DETECTA..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectados..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DETECTA..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NON DETECTA..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectados..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NON DETECTA..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectados..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON DETECTA..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectados..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON DETECTA..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,63 +276,63 @@
 "\n"
 "Informes como xestor de xanelas \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectado: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/he.po -> LiVES-2.0.4.tar.bz2/po/he.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -145,23 +145,23 @@
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -173,104 +173,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...זוהה..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse Audio...לא זוהה..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...זוהה..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...לא זוהה..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...זוהה..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...לא זוהה..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...זוהה..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...לא זוהה..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -281,48 +281,48 @@
 "\n"
 "מנהל החלונות המדווח הוא \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "מספר הצגים שזוהו: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/hr.po -> LiVES-2.0.4.tar.bz2/po/hr.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...otkriti..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIJE PRONAĐEN..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...otkriti..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python......NIJE PRONAĐEN..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...otkriti..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIJE PRONAĐEN..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...otkriti..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIJE PRONAĐEN..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,48 +276,48 @@
 "\n"
 "Uređivač prozora prijavljuje kao \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "Pronađen broj zaslona: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/hu.po -> LiVES-2.0.4.tar.bz2/po/hu.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Teszt"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...megtalálva..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NEM TALÁLOM..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...megtalálva..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NEM TALÁLOM..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...megtalálva..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NEM TALÁLOM..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...megtalálva..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NEM TALÁLOM..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,48 +276,48 @@
 "\n"
 "Az ablakkezelő jelenti: \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "monitorok száma: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, fuzzy, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "monitorok száma: %d\n"
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "kicsi endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "nagy endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/it.po -> LiVES-2.0.4.tar.bz2/po/it.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "audio pulse...rilevato..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "audio pulse...NON RILEVATO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...rilevato..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NON RILEVATO..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...rilevato..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON RILEVATO..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...rilevato..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON RILEVATO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,48 +276,48 @@
 "\n"
 "Il gestore delle finestre riporta come \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numero di monitor rilevati: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "piccolo endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "grosso endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/ja.po -> LiVES-2.0.4.tar.bz2/po/ja.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "テスト"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convertが見つかりました..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "compositeが見つかりました..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "soxが見つかりました\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "soxは見つかりませんでした\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wavが見つかりました..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wavは見つかりませんでした..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackdが見つかりました..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackdは見つかりませんでした..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulseaudioが見つかりました..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulseaudioは見つかりませんでした..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "pythonが見つかりました..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "pythonは見つかりませんでした..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrabが見つかりました..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrabは見つかりませんでした..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfoが見つかりました..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfoは見つかりませんでした..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr "不明 - パッチを送ってください！"
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,48 +276,48 @@
 "\n"
 "ウィンドウマネジャーは \"%s\" です; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "検出されたモニタ数: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "リトルエンディアン"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "ビッグエンディアン"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/lives.pot -> LiVES-2.0.4.tar.bz2/po/lives.pot Changed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 2.0.3\n"
+"Project-Id-Version: lives 2.0.4\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -125,23 +125,23 @@
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -153,104 +153,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -258,198 +258,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733

LiVES-2.0.3.tar.bz2/po/nl_NL.po -> LiVES-2.0.4.tar.bz2/po/nl_NL.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES 0.9.5cvs\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: \n"
@@ -123,23 +123,23 @@
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -151,104 +151,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -256,198 +256,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/oc.po -> LiVES-2.0.4.tar.bz2/po/oc.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -128,23 +128,23 @@
 msgid "Test"
 msgstr "Testar"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -156,104 +156,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...PAS DETECTAT..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...PAS DETECTAT..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...PAS DETECTAT..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...PAS DETECTAT..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -264,63 +264,63 @@
 "\n"
 "Lo gestionari de fenèstras apareis coma essent  \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre d'ecrans trobats : %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/pl.po -> LiVES-2.0.4.tar.bz2/po/pl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -140,23 +140,23 @@
 msgid "Test"
 msgstr "Przetestuj"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -168,104 +168,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykrytych..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...wykrytych..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NIE WYKRYTO..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...wykrytych..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIE WYKRYTO..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...wykrytych..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIE WYKRYTO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -276,63 +276,63 @@
 "\n"
 "Sprawozdania Menedżer okien jako \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "liczba wykrytych monitorów: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/pt.po -> LiVES-2.0.4.tar.bz2/po/pt.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -134,23 +134,23 @@
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -162,104 +162,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -270,63 +270,63 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/pt_BR.po -> LiVES-2.0.4.tar.bz2/po/pt_BR.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -137,23 +137,23 @@
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -165,104 +165,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -273,48 +273,48 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/ro.po -> LiVES-2.0.4.tar.bz2/po/ro.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -141,23 +141,23 @@
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -169,104 +169,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NU A FOST DETECTAT..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NU A FOST DETECTAT..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NU A FOST DETECTAT..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NU A FOST DETECTAT..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -277,48 +277,48 @@
 "\n"
 "Rapoarte de manager de ferestre ca \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numărul de monitoare detectate: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/ru.po -> LiVES-2.0.4.tar.bz2/po/ru.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -145,23 +145,23 @@
 msgid "Test"
 msgstr "Тест"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -182,104 +182,104 @@
 "Также, вы можете попробовать запустить программу таким образом \"lives -"
 "jackopts 16\" или "
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...обнаружен..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...обнаружен..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...обнаружен..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...обнаружен..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -290,48 +290,48 @@
 "\n"
 "Менеджер интерфейса определен как \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "обнаружено мониторов: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/sk.po -> LiVES-2.0.4.tar.bz2/po/sk.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -145,23 +145,23 @@
 msgid "Test"
 msgstr "Otestovať"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -173,104 +173,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NENÁJDENÝ..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...nájdené..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NENÁJDENÉ..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...nájdený..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...NENÁJDENÝ..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...nájdený..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NENÁJDENÝ..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...nájdený..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NENÁJDENÝ..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -281,48 +281,48 @@
 "\n"
 "Správa manažéra okien ako \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nájdených monitorov: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "malý endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "veľký endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/te.po -> LiVES-2.0.4.tar.bz2/po/te.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -127,23 +127,23 @@
 msgid "Test"
 msgstr "పరిశీలన"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -155,104 +155,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -260,198 +260,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/tr.po -> LiVES-2.0.4.tar.bz2/po/tr.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -141,23 +141,23 @@
 msgid "Test"
 msgstr "Sınama"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -169,104 +169,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "Pulse audio... algılandı..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse audio...ALGILANMADI..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...bulundu..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...BULUNAMADI..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...bulundu..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...BULUNAMADI..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...bulundu..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...BULUNAMADI..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -277,48 +277,48 @@
 "\n"
 "Pencere yöneticisi raporları olarak \"%s\"; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "bulunan monitor sayısı : %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/ug.po -> LiVES-2.0.4.tar.bz2/po/ug.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -126,23 +126,23 @@
 msgid "Test"
 msgstr "سىناق"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -154,104 +154,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -259,198 +259,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/uk.po -> LiVES-2.0.4.tar.bz2/po/uk.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-22 06:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -146,23 +146,23 @@
 msgid "Test"
 msgstr "Перевірити"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -181,104 +181,104 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd…виявлено…"
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio…виявлено…"
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python…виявлено…"
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab…виявлено…"
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo…виявлено…"
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr "Версія Windows %04X"
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr "НЕВІДОМИЙ — будь ласка, накладіть латку!"
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -289,48 +289,48 @@
 "\n"
 "Інструмент керування вікнами — «%s»; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "виявлена кількість моніторів: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Кількість виявлених процесорів: %d "
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d-бітова, %s)\n"

LiVES-2.0.3.tar.bz2/po/uz.po -> LiVES-2.0.4.tar.bz2/po/uz.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-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"
@@ -146,23 +146,23 @@
 msgid "Test"
 msgstr "Синаш"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -174,104 +174,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "конвертлаш...аниқланди..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "конвертлаш...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...аниқланди..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...аниқланди\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...АНИҚЛАНМАДИ\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...аниқланди..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...аниқланди..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...аниқланди..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...аниқланди..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...аниқланди..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...аниқланди..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -282,198 +282,198 @@
 "\n"
 "Ойна бошқарувчиси \"%s\"сифатида маълумот берди; "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "мониторлар миқдори аниқланди: %d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/po/zh_CN.po -> LiVES-2.0.4.tar.bz2/po/zh_CN.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"POT-Creation-Date: 2013-05-04 16:07-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -138,23 +138,23 @@
 msgid "Test"
 msgstr "测试"
 
-#: src/main.c:1501
+#: src/main.c:1502
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1565
+#: src/main.c:1566
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1567
+#: src/main.c:1568
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1568
+#: src/main.c:1569
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1598
+#: src/main.c:1599
 #, c-format
 msgid ""
 "\n"
@@ -166,104 +166,104 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1626
+#: src/main.c:1627
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1689
+#: src/main.c:1690
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1690
+#: src/main.c:1691
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1691
+#: src/main.c:1692
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1692
+#: src/main.c:1693
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1693
+#: src/main.c:1694
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1694
+#: src/main.c:1695
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1695
+#: src/main.c:1696
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1696
+#: src/main.c:1697
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1697
+#: src/main.c:1698
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1698
+#: src/main.c:1699
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1699
+#: src/main.c:1700
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1700
+#: src/main.c:1701
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1701
+#: src/main.c:1702
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...未发现..."
 
-#: src/main.c:1702
+#: src/main.c:1703
 msgid "pulse audio...detected..."
 msgstr "pulse audio...发现..."
 
-#: src/main.c:1703
+#: src/main.c:1704
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse 音频...未发现..."
 
-#: src/main.c:1704
+#: src/main.c:1705
 msgid "python...detected..."
 msgstr "python...发现..."
 
-#: src/main.c:1705
+#: src/main.c:1706
 msgid "python...NOT DETECTED..."
 msgstr "python...未发现..."
 
-#: src/main.c:1706
+#: src/main.c:1707
 msgid "dvgrab...detected..."
 msgstr "dvgrab...发现..."
 
-#: src/main.c:1707
+#: src/main.c:1708
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...未发现..."
 
-#: src/main.c:1708
+#: src/main.c:1709
 msgid "xwininfo...detected..."
 msgstr "xwininfo...发现..."
 
-#: src/main.c:1709
+#: src/main.c:1710
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...未发现..."
 
-#: src/main.c:1715
+#: src/main.c:1716
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1717
+#: src/main.c:1718
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1721
+#: src/main.c:1722
 #, c-format
 msgid ""
 "\n"
@@ -274,48 +274,48 @@
 "\n"
 "窗口管理器报告为\"%s\"； "
 
-#: src/main.c:1724
+#: src/main.c:1725
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "检测到的显视器数量：%d\n"
 
-#: src/main.c:1727
+#: src/main.c:1728
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1730 src/multitrack.c:4635
+#: src/main.c:1731 src/multitrack.c:4634
 msgid "little endian"
 msgstr "小端"
 
-#: src/main.c:1731 src/multitrack.c:4634
+#: src/main.c:1732 src/multitrack.c:4633
 msgid "big endian"
 msgstr "大端"
 
-#: src/main.c:1732
+#: src/main.c:1733
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""

LiVES-2.0.3.tar.bz2/smogrify -> LiVES-2.0.4.tar.bz2/smogrify Changed

LiVES-2.0.3.tar.bz2/src/audio.c -> LiVES-2.0.4.tar.bz2/src/audio.c Changed

LiVES-2.0.3.tar.bz2/src/callbacks.c -> LiVES-2.0.4.tar.bz2/src/callbacks.c Changed

@@ -376,7 +376,7 @@
 
       threaded_dialog_spin();
       if (mainw->current_file>-1) sensitize();
-      gtk_widget_queue_draw(mainw->LiVES);
+      lives_widget_queue_draw(mainw->LiVES);
       d_print_done();
       end_threaded_dialog();
 
@@ -396,10 +396,10 @@
     // stop valgrind from complaining
 #ifdef VALG_COMPLAIN
     if (mainw->preview_image!=NULL && GTK_IS_IMAGE(mainw->preview_image)) 
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL);
+      lives_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL);
 
-    if (mainw->image272!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272), NULL);
-    if (mainw->image273!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273), NULL);
+    if (mainw->image272!=NULL) lives_image_set_from_pixbuf(GTK_IMAGE(mainw->image272), NULL);
+    if (mainw->image273!=NULL) lives_image_set_from_pixbuf(GTK_IMAGE(mainw->image273), NULL);
 #endif
 
     if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
@@ -517,7 +517,7 @@
   boolean is_dir=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"is_dir"));
 
   if (GTK_IS_TEXT_VIEW(tentry)) fname=text_view_get_text(LIVES_TEXT_VIEW(tentry));
-  else fname=g_strdup(gtk_entry_get_text(GTK_ENTRY(tentry)));
+  else fname=g_strdup(lives_entry_get_text(GTK_ENTRY(tentry)));
 
   if (!strlen(fname)) {
     g_free(fname);
@@ -540,7 +540,7 @@
   g_free(dirname);
 
   if (button!=NULL) {
-    if (GTK_IS_ENTRY(tentry)) gtk_entry_set_text(GTK_ENTRY(tentry),(tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)));
+    if (GTK_IS_ENTRY(tentry)) lives_entry_set_text(GTK_ENTRY(tentry),(tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)));
     else text_view_set_text (LIVES_TEXT_VIEW(tentry), (tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)), -1);
     g_free(tmp);
   }
@@ -573,7 +573,7 @@
     g_strappend (file_name,PATH_MAX,LIVES_TMP_NAME"\\");
 #endif
 
-  gtk_entry_set_text(entry,file_name);
+  lives_entry_set_text(entry,file_name);
 
 }
 
@@ -588,8 +588,8 @@
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
-    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
 
   choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,1);
@@ -598,7 +598,7 @@
 
 
 void on_ok_filesel_open_clicked (GtkFileChooser *chooser, gpointer user_data) {
-  gchar *fname=gtk_file_chooser_get_filename (chooser);
+  gchar *fname=lives_file_chooser_get_filename (chooser);
   gchar *tmp;
 
   if (fname==NULL) return;
@@ -607,13 +607,13 @@
   g_free(tmp); g_free(fname);
 
   end_fs_preview();
-  gtk_widget_destroy(GTK_WIDGET(chooser));
+  lives_widget_destroy(GTK_WIDGET(chooser));
 
   g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
   get_dirname(mainw->vid_load_dir);
 
-  if (mainw->multitrack==NULL) gtk_widget_queue_draw(mainw->LiVES);
-  else gtk_widget_queue_draw(mainw->multitrack->window);
+  if (mainw->multitrack==NULL) lives_widget_queue_draw(mainw->LiVES);
+  else lives_widget_queue_draw(mainw->multitrack->window);
   lives_widget_context_update();
   
   mainw->fs_playarea=NULL;
@@ -639,15 +639,15 @@
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
-    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
 
   mainw->fx1_val=1;
   mainw->fx2_val=1;
   mainw->fx3_val=128;
   vcdtrack_dialog = create_cdtrack_dialog (GPOINTER_TO_INT (user_data),NULL);
-  gtk_widget_show (vcdtrack_dialog);
+  lives_widget_show (vcdtrack_dialog);
 }
 
 
@@ -661,12 +661,12 @@
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
-    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
 
   locw=create_location_dialog(1);
-  gtk_widget_show(locw->dialog);
+  lives_widget_show(locw->dialog);
 
 }
 
@@ -681,12 +681,12 @@
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
-    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
 
   locw=create_location_dialog(2);
-  gtk_widget_show(locw->dialog);
+  lives_widget_show(locw->dialog);
 }
 
 
@@ -703,10 +703,10 @@
     if (cdsw->warn_checkbutton!=NULL) {
       if (prefs->ar_layout) {
 	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cdsw->warn_checkbutton),FALSE);
-	gtk_widget_set_sensitive(cdsw->warn_checkbutton,FALSE);
+	lives_widget_set_sensitive(cdsw->warn_checkbutton,FALSE);
       }
       else {
-	gtk_widget_set_sensitive(cdsw->warn_checkbutton,TRUE);
+	lives_widget_set_sensitive(cdsw->warn_checkbutton,TRUE);
       }
     }
   }
@@ -775,8 +775,8 @@
 on_location_select                   (GtkButton       *button,
 				      gpointer         user_data)
 {
-  g_snprintf(file_name,PATH_MAX,"%s",gtk_entry_get_text(GTK_ENTRY(locw->entry)));
-  gtk_widget_destroy(locw->dialog);
+  g_snprintf(file_name,PATH_MAX,"%s",lives_entry_get_text(GTK_ENTRY(locw->entry)));
+  lives_widget_destroy(locw->dialog);
   lives_widget_context_update();
   g_free(locw);
 
@@ -802,7 +802,7 @@
 
 
 void on_utube_select (GtkButton *button, gpointer user_data) {
-  gchar *fname=ensure_extension(gtk_entry_get_text(GTK_ENTRY(locw->name_entry)),".webm");
+  gchar *fname=ensure_extension(lives_entry_get_text(GTK_ENTRY(locw->name_entry)),".webm");
   gchar *url;
   gchar *dirname;
   gchar *dfile;
@@ -816,7 +816,7 @@
     return;
   }
 
-  url=g_strdup(gtk_entry_get_text(GTK_ENTRY(locw->entry)));
+  url=g_strdup(lives_entry_get_text(GTK_ENTRY(locw->entry)));
 
   if (!strlen(url)) {
     do_blocking_error_dialog(_("Please enter a valid URL for the download.\n"));
@@ -825,11 +825,11 @@
     return;
   }
 
-  dirname=g_strdup(gtk_entry_get_text(GTK_ENTRY(locw->dir_entry)));
+  dirname=g_strdup(lives_entry_get_text(GTK_ENTRY(locw->dir_entry)));
   ensure_isdir(dirname);
   g_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",dirname);
 
-  gtk_widget_destroy(locw->dialog);
+  lives_widget_destroy(locw->dialog);
   lives_widget_context_update();
   g_free(locw);
 
@@ -1013,9 +1013,9 @@
   g_free(com);
 
   if (mainw->current_file>-1&&cfile!=NULL&&cfile->proc_ptr!=NULL) {
-    gtk_widget_set_sensitive(cfile->proc_ptr->stop_button, FALSE);
-    gtk_widget_set_sensitive(cfile->proc_ptr->preview_button, FALSE);

LiVES-2.0.3.tar.bz2/src/dialogs.c -> LiVES-2.0.4.tar.bz2/src/dialogs.c Changed

@@ -54,10 +54,10 @@
     // this is for the cds window - disable autoreload if we are not gonna show this window
     if (lives_toggle_button_get_active(togglebutton)) {
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(tbutton),FALSE);
-      gtk_widget_set_sensitive(tbutton,FALSE);
+      lives_widget_set_sensitive(tbutton,FALSE);
     }
     else {
-      gtk_widget_set_sensitive(tbutton,TRUE);
+      lives_widget_set_sensitive(tbutton,TRUE);
     }
   }
 
@@ -75,7 +75,7 @@
   GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
   
   gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
-  gtk_container_add (GTK_CONTAINER (expander), textview);
+  lives_container_add (GTK_CONTAINER (expander), textview);
 
   if (palette->style&STYLE_1) {
     label=gtk_expander_get_label_widget(GTK_EXPANDER(expander));
@@ -93,8 +93,8 @@
     xlist=xlist->next;
   }
 
-  gtk_box_pack_start (box, expander, FALSE, FALSE, widget_opts.packing_height);
-  gtk_widget_show_all(expander);
+  lives_box_pack_start (box, expander, FALSE, FALSE, widget_opts.packing_height);
+  lives_widget_show_all(expander);
 }
 
 
@@ -110,7 +110,7 @@
 					       _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
 					       TRUE,LIVES_BOX(box),NULL);
 
-  gtk_widget_show_all(hbox);
+  lives_widget_show_all(hbox);
  
   g_signal_connect (GTK_OBJECT (checkbutton), "toggled",
 		    G_CALLBACK (on_warn_mask_toggled),
@@ -121,28 +121,28 @@
 static void add_clear_ds_button(GtkDialog* dialog) {
   GtkWidget *button = gtk_button_new_from_stock ("gtk-clear");
 
-  gtk_button_set_label(GTK_BUTTON(button),_("_Recover disk space"));
-  if (mainw->tried_ds_recover) gtk_widget_set_sensitive(button,FALSE);
+  lives_button_set_label(GTK_BUTTON(button),_("_Recover disk space"));
+  if (mainw->tried_ds_recover) lives_widget_set_sensitive(button,FALSE);
 
   g_signal_connect (GTK_OBJECT (button), "clicked",
 		    G_CALLBACK (on_cleardisk_activate),
 		    (gpointer)button);
 
-  gtk_widget_show(button);
-  gtk_dialog_add_action_widget (dialog, button, LIVES_RETRY);
+  lives_widget_show(button);
+  lives_dialog_add_action_widget (dialog, button, LIVES_RETRY);
 
 }
 
 
 static void add_clear_ds_adv(GtkBox *box) {
   // add a button which opens up  Recover/Repair widget
-  GtkWidget *button = gtk_button_new_with_mnemonic(_(" _Advanced Settings >>"));
+  GtkWidget *button = lives_button_new_with_mnemonic(_(" _Advanced Settings >>"));
   GtkWidget *hbox = lives_hbox_new (FALSE, 0);
 
-  gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, widget_opts.packing_width*2);
-  gtk_box_pack_start (box, hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, widget_opts.packing_width*2);
+  lives_box_pack_start (box, hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  gtk_widget_show_all(hbox);
+  lives_widget_show_all(hbox);
 
   g_signal_connect (GTK_OBJECT (button), "clicked",
 		    G_CALLBACK (on_cleardisk_advanced_clicked),
@@ -163,7 +163,7 @@
   GtkWidget *warning_okbutton=NULL;
   GtkWidget *abortbutton=NULL;
 
-  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(lives_accel_group_new ());
 
   gchar *textx;
 
@@ -176,40 +176,40 @@
       add_clear_ds_button(GTK_DIALOG(dialog));
     }
 
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Warning !"));
+    lives_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Warning !"));
     widget_opts.justify=LIVES_JUSTIFY_CENTER;
     mainw->warning_label = lives_standard_label_new (_("warning"));
     widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, GTK_RESPONSE_CANCEL);
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, GTK_RESPONSE_CANCEL);
     warning_okbutton = gtk_button_new_from_stock ("gtk-ok");
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, GTK_RESPONSE_OK);
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, GTK_RESPONSE_OK);
     break;
   case LIVES_DIALOG_YESNO:
     dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s","");
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Question"));
+    lives_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Question"));
     widget_opts.justify=LIVES_JUSTIFY_CENTER;
     mainw->warning_label = lives_standard_label_new (_("question"));
     widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-no");
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_NO);
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_NO);
     warning_okbutton = gtk_button_new_from_stock ("gtk-yes");
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, LIVES_YES);
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, LIVES_YES);
     break;
   case LIVES_DIALOG_ABORT_CANCEL_RETRY:
     dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,"%s","");
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - File Error"));
+    lives_window_set_title (GTK_WINDOW (dialog), _("LiVES: - File Error"));
     widget_opts.justify=LIVES_JUSTIFY_CENTER;
     mainw->warning_label = lives_standard_label_new (_("File Error"));
     widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     abortbutton = gtk_button_new_from_stock ("gtk-quit");
-    gtk_button_set_label(GTK_BUTTON(abortbutton),_("_Abort"));
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), abortbutton, LIVES_ABORT);
+    lives_button_set_label(GTK_BUTTON(abortbutton),_("_Abort"));
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), abortbutton, LIVES_ABORT);
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_CANCEL);
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_CANCEL);
     warning_okbutton = gtk_button_new_from_stock ("gtk-refresh");
-    gtk_button_set_label(GTK_BUTTON(warning_okbutton),_("_Retry"));
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, LIVES_RETRY);
+    lives_button_set_label(GTK_BUTTON(warning_okbutton),_("_Retry"));
+    lives_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, LIVES_RETRY);
     break;
   default:
     return NULL;
@@ -226,16 +226,16 @@
   gtk_window_set_deletable(GTK_WINDOW(dialog), FALSE);
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), widget_opts.border_width*2);
+  lives_container_set_border_width (GTK_CONTAINER (dialog), widget_opts.border_width*2);
 
   textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS);
-  gtk_label_set_text(GTK_LABEL(mainw->warning_label),textx);
+  lives_label_set_text(GTK_LABEL(mainw->warning_label),textx);
 
   g_free(textx);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), mainw->warning_label, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), mainw->warning_label, TRUE, TRUE, 0);
   gtk_label_set_selectable (GTK_LABEL (mainw->warning_label), TRUE);
 
   if (mainw->add_clear_ds_adv) {
@@ -257,20 +257,20 @@
 
   lives_widget_set_can_focus_and_default (warning_cancelbutton);
 
-  gtk_widget_add_accelerator (warning_cancelbutton, "activate", accel_group,
+  lives_widget_add_accelerator (warning_cancelbutton, "activate", accel_group,
 			      LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  gtk_widget_add_accelerator (warning_okbutton, "activate", accel_group,
+  lives_widget_add_accelerator (warning_okbutton, "activate", accel_group,
 			      LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
 
   lives_widget_set_can_focus_and_default (warning_okbutton);
   gtk_widget_grab_default (warning_okbutton);
 
-  gtk_widget_show_all(dialog);
+  lives_widget_show_all(dialog);
   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
   if (prefs->present) {
-    gtk_window_present (GTK_WINDOW (dialog));
+    lives_window_present (GTK_WINDOW (dialog));
     gdk_window_raise (lives_widget_get_xwindow(dialog));
   }
 
@@ -310,9 +310,9 @@
 
   do {
     warning=create_warn_dialog(warn_mask_number,transient,mytext,LIVES_DIALOG_WARN);
-    gtk_widget_show(warning);
-    response=gtk_dialog_run (GTK_DIALOG (warning));
-    gtk_widget_destroy (warning);
+    lives_widget_show(warning);
+    response=lives_dialog_run (GTK_DIALOG (warning));
+    lives_widget_destroy (warning);
   } while (response==LIVES_RETRY);
 
   lives_widget_context_update();
@@ -338,8 +338,8 @@

LiVES-2.0.3.tar.bz2/src/effects-data.c -> LiVES-2.0.4.tar.bz2/src/effects-data.c Changed

@@ -1999,11 +1999,11 @@
   register int i;
 
   for (i=0;i<conxwp->num_alpha;i++) {
-    gtk_combo_box_set_active (LIVES_COMBO(conxwp->cfxcombo[i]),0);
+    lives_combo_set_active_index (LIVES_COMBO(conxwp->cfxcombo[i]),0);
   }
 
   for (i=0;i<conxwp->num_params;i++) {
-    gtk_combo_box_set_active (LIVES_COMBO(conxwp->pfxcombo[i]),0);
+    lives_combo_set_active_index (LIVES_COMBO(conxwp->pfxcombo[i]),0);
   }
 
 }
@@ -2028,8 +2028,8 @@
 
   register int i,j=0,k=0;
 
-  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
-  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+  if (!lives_combo_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=lives_combo_get_model(GTK_COMBO_BOX(combo));
 
   gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
@@ -2064,12 +2064,13 @@
     if (!params_compatible(oparam,param)) continue;
  
     if (k>0) {
-      model=gtk_combo_box_get_model(GTK_COMBO_BOX(conxwp->pfxcombo[k]));
+      model=lives_combo_get_model(GTK_COMBO_BOX(conxwp->pfxcombo[k]));
       gtk_tree_model_get_iter(model,&iter,tpath);
-      gtk_combo_box_set_active_iter(LIVES_COMBO(conxwp->pfxcombo[k]),&iter);
+      lives_combo_set_active_iter(LIVES_COMBO(conxwp->pfxcombo[k]),&iter);
       lives_widget_context_update();
     }
-    gtk_combo_box_set_active(LIVES_COMBO(conxwp->pcombo[k++]),i);
+
+    lives_combo_set_active_index(LIVES_COMBO(conxwp->pcombo[k++]),i);
 
     if (k>=conxwp->num_params) break;
   }
@@ -2104,8 +2105,8 @@
 
   register int i,j=0,k=0;
 
-  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
-  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+  if (!lives_combo_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=lives_combo_get_model(GTK_COMBO_BOX(combo));
 
   gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
@@ -2134,12 +2135,12 @@
     if (cconx_get_out_alpha(TRUE,key,mode,j-1)!=NULL) continue;
 
     if (k>0) {
-      model=gtk_combo_box_get_model(GTK_COMBO_BOX(conxwp->cfxcombo[k]));
+      model=lives_combo_get_model(GTK_COMBO_BOX(conxwp->cfxcombo[k]));
       gtk_tree_model_get_iter(model,&iter,tpath);
-      gtk_combo_box_set_active_iter(LIVES_COMBO(conxwp->cfxcombo[k]),&iter);
+      lives_combo_set_active_iter(LIVES_COMBO(conxwp->cfxcombo[k]),&iter);
       lives_widget_context_update();
     }
-    gtk_combo_box_set_active(LIVES_COMBO(conxwp->ccombo[k++]),i);
+    lives_combo_set_active_index(LIVES_COMBO(conxwp->ccombo[k++]),i);
     if (k>=conxwp->num_alpha) break;
   }
 
@@ -2173,8 +2174,8 @@
 
   register int i,j=0;
 
-  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
-  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+  if (!lives_combo_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=lives_combo_get_model(GTK_COMBO_BOX(combo));
 
   gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
@@ -2187,10 +2188,10 @@
   }
 
   if (fidx==-1) {
-    gtk_combo_box_set_active (LIVES_COMBO(combo),0);
+    lives_combo_set_active_index (LIVES_COMBO(combo),0);
     lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),NULL);
     lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
-    if (ours==0) gtk_widget_set_sensitive(acbutton,FALSE);
+    if (ours==0) lives_widget_set_sensitive(acbutton,FALSE);
     return;
   }
 
@@ -2215,7 +2216,7 @@
   lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),clist);
   lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
   
-  if (ours==0) gtk_widget_set_sensitive(acbutton,TRUE);
+  if (ours==0) lives_widget_set_sensitive(acbutton,TRUE);
 
   g_list_free_strings(clist);
   g_list_free(clist);
@@ -2250,7 +2251,7 @@
 
   register int i,j=0;
 
-  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) {
+  if (!lives_combo_get_active_iter(GTK_COMBO_BOX(combo),&iter)) {
     return;
   }
 
@@ -2261,7 +2262,7 @@
     }
   }
 
-  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+  model=lives_combo_get_model(GTK_COMBO_BOX(combo));
 
   gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
@@ -2270,15 +2271,15 @@
     GtkWidget *acheck=conxwp->acheck[ours];
     g_signal_handler_block(acheck,conxwp->acheck_func[ours]);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE);
-    gtk_widget_set_sensitive(acheck,FALSE);
+    lives_widget_set_sensitive(acheck,FALSE);
     g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
 
-    gtk_combo_box_set_active (LIVES_COMBO(combo),0);
+    lives_combo_set_active_index (LIVES_COMBO(combo),0);
 
     lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),NULL);
     lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
 
-    if (ours==0) gtk_widget_set_sensitive(apbutton,FALSE);
+    if (ours==0) lives_widget_set_sensitive(apbutton,FALSE);
     return;
   }
 
@@ -2328,7 +2329,7 @@
   lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),plist);
   lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
 
-  if (ours==0) gtk_widget_set_sensitive(apbutton,TRUE);
+  if (ours==0) lives_widget_set_sensitive(apbutton,TRUE);
 
   g_list_free_strings(plist);
   g_list_free(plist);
@@ -2393,7 +2394,7 @@
 	break;
       }
 
-    if (!hasone) gtk_widget_set_sensitive(disconbutton,FALSE);
+    if (!hasone) lives_widget_set_sensitive(disconbutton,FALSE);
 
     if (conxwp->ikeys[conxwp->num_alpha+ours]!=0) {
       pconx_delete(conxwp->okey,conxwp->omode,ours,
@@ -2415,9 +2416,9 @@
 
   fxcombo=conxwp->pfxcombo[ours];
 
-  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(fxcombo),&iter)) return;
+  if (!lives_combo_get_active_iter(GTK_COMBO_BOX(fxcombo),&iter)) return;
 
-  model=gtk_combo_box_get_model(GTK_COMBO_BOX(fxcombo));
+  model=lives_combo_get_model(GTK_COMBO_BOX(fxcombo));
 
   gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
@@ -2469,7 +2470,7 @@
   if (weed_plant_has_leaf(param,"min")&&weed_plant_has_leaf(param,"max")) {
     boolean hasrange=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(acheck),"available"));
     if (hasrange) {
-      gtk_widget_set_sensitive(acheck,TRUE);
+      lives_widget_set_sensitive(acheck,TRUE);
       if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc))) {
 	g_signal_handler_block(acheck,conxwp->acheck_func[ours]);
 	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),TRUE);
@@ -2497,7 +2498,7 @@
   conxwp->imodes[conxwp->num_alpha+ours]=mode;
   conxwp->idx[conxwp->num_alpha+ours]=j;
 
-  gtk_widget_set_sensitive(disconbutton,TRUE);
+  lives_widget_set_sensitive(disconbutton,TRUE);
 
 }
 
@@ -2544,7 +2545,7 @@
 	break;
       }
 
-    if (!hasone) gtk_widget_set_sensitive(disconbutton,FALSE);
+    if (!hasone) lives_widget_set_sensitive(disconbutton,FALSE);
 
     if (conxwp->ikeys[ours]!=0) cconx_delete(conxwp->okey,conxwp->omode,ours,
 					     conxwp->ikeys[ours]-1,
@@ -2561,9 +2562,9 @@
 
   fxcombo=conxwp->cfxcombo[ours];

LiVES-2.0.3.tar.bz2/src/effects-weed.c -> LiVES-2.0.4.tar.bz2/src/effects-weed.c Changed

@@ -1948,7 +1948,7 @@
     // try to set our target width height - the channel may have restrictions
     set_channel_size(channel,width,height,0,NULL);
 
-    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) continue;
+    if (weed_palette_is_alpha_palette(cpalette)) continue;
 
     width=weed_get_int_value(channel,"width",&error)*weed_palette_get_pixels_per_macropixel(cpalette)/
       weed_palette_get_pixels_per_macropixel(palette);
@@ -1958,10 +1958,13 @@
 
     set_channel_size(channel,incwidth,incheight,0,NULL);
 
+    palette=weed_get_int_value(layer,"current_palette",&error);
+    inpalette=cpalette;
 
     // check if we need to resize
     if ((inwidth!=width)||(inheight!=height)) {
       // layer needs resizing
+
       if (prefs->pb_quality==PB_QUALITY_HIGH||opwidth==0||opheight==0) {
 	if (!resize_layer(layer,width,height,GDK_INTERP_HYPER,cpalette,iclamping)) return FILTER_ERROR_UNABLE_TO_RESIZE;
       }
@@ -1969,7 +1972,12 @@
 	if (!resize_layer(layer,width,height,get_interp_value(prefs->pb_quality),cpalette,iclamping)) return FILTER_ERROR_UNABLE_TO_RESIZE;
       }
 
-      inwidth=weed_get_int_value(layer,"width",&error);
+      // check palette again in case it changed during resize
+      inpalette=weed_get_int_value(channel,"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);
+
       inheight=weed_get_int_value(layer,"height",&error);
 
       if ((inwidth!=width)||(inheight!=height)) {
@@ -1981,12 +1989,8 @@
       }
     }
     
-
     i++;
 
-    // check palette again in case it changed during resize
-    palette=weed_get_int_value(layer,"current_palette",&error);
-    inpalette=weed_get_int_value(channel,"current_palette",&error);
     
     // try to match palettes with first enabled in channel: 
     // TODO ** - we should see which palette causes the least palette conversions
@@ -4589,19 +4593,19 @@
 	    pkgstring=g_strdup_printf(_(" - %s plugins -"),pkg);
 	    // create new submenu
 	      
-	    pkg_menu=gtk_menu_item_new_with_label (pkgstring);
-	    gtk_container_add (GTK_CONTAINER (mainw->rte_defs), pkg_menu);
+	    pkg_menu=lives_menu_item_new_with_label (pkgstring);
+	    lives_container_add (GTK_CONTAINER (mainw->rte_defs), pkg_menu);
 	    gtk_menu_reorder_child(GTK_MENU(mainw->rte_defs),pkg_menu,pkg_posn++);
 	      
-	    pkg_submenu=gtk_menu_new();
-	    gtk_menu_item_set_submenu (GTK_MENU_ITEM (pkg_menu), pkg_submenu);
+	    pkg_submenu=lives_menu_new();
+	    lives_menu_item_set_submenu (GTK_MENU_ITEM (pkg_menu), pkg_submenu);
 	      
 	    if (palette->style&STYLE_1) {
 	      lives_widget_set_bg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
 	    }
 	      
-	    gtk_widget_show (pkg_menu);
-	    gtk_widget_show (pkg_submenu);
+	    lives_widget_show (pkg_menu);
+	    lives_widget_show (pkg_submenu);
 	    g_free(pkgstring);
 	  }
 	  // add to submenu
@@ -4616,12 +4620,12 @@
 	filter_type=weed_filter_get_type(filter,TRUE,FALSE);
 	string=g_strdup_printf("%s (%s)",filter_name,filter_type);
 	  
-	menuitem=gtk_menu_item_new_with_label (string);
-	gtk_widget_show(menuitem);
+	menuitem=lives_menu_item_new_with_label (string);
+	lives_widget_show(menuitem);
 	g_free(string);
 	g_free(filter_type);
 	  
-	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	lives_container_add (GTK_CONTAINER (menu), menuitem);
 	  
 	g_signal_connect (GTK_OBJECT (menuitem), "activate",
 			  G_CALLBACK (rte_set_defs_activate),
@@ -5481,12 +5485,12 @@
       filter_type=weed_filter_get_type(filter,TRUE,FALSE);
       string=g_strdup_printf("%s (%s)",filter_name,filter_type);
       
-      menuitem=gtk_menu_item_new_with_label (string);
-      gtk_widget_show(menuitem);
+      menuitem=lives_menu_item_new_with_label (string);
+      lives_widget_show(menuitem);
       g_free(string);
       g_free(filter_type);
       
-      gtk_container_add (GTK_CONTAINER (mainw->rte_defs), menuitem);
+      lives_container_add (GTK_CONTAINER (mainw->rte_defs), menuitem);
       
       g_signal_connect (GTK_OBJECT (menuitem), "activate",
 			G_CALLBACK (rte_set_defs_activate),
@@ -7169,7 +7173,7 @@
     play_file();
 
     if (mainw->play_window!=NULL) {
-      gtk_widget_queue_draw(mainw->play_window);
+      lives_widget_queue_draw(mainw->play_window);
     }
   }
   else {
@@ -7191,7 +7195,7 @@
 	mainw->new_blend_file=-1;
       }    
       else {
-	gtk_widget_show(mainw->playframe);
+	lives_widget_show(mainw->playframe);
 	resize(1);
       }
       //if (old_file==-1) mainw->whentostop=STOP_ON_VID_END;
@@ -7317,7 +7321,7 @@
 	  mainw->current_file=fg_generator_clip;
 	  cfile->fps=weed_get_double_value(inst,"target_fps",&error);
 	  set_main_title(cfile->file_name,0);
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
+	  lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
 	  mainw->current_file=current_file;
 	}

LiVES-2.0.3.tar.bz2/src/effects.c -> LiVES-2.0.4.tar.bz2/src/effects.c Changed

@@ -270,8 +270,8 @@
   mainw->last_dprint_file=ldfile;
 
   cfile->redoable=cfile->undoable=FALSE;
-  gtk_widget_set_sensitive (mainw->redo, FALSE);
-  gtk_widget_set_sensitive (mainw->undo, FALSE);
+  lives_widget_set_sensitive (mainw->redo, FALSE);
+  lives_widget_set_sensitive (mainw->undo, FALSE);
 
   cfile->undo_action=UNDO_EFFECT;
 
@@ -379,11 +379,11 @@
   cfile->fx_frame_pump=0;
 
   if (!mainw->gen_to_clipboard) {
-    gtk_widget_set_sensitive (mainw->undo, TRUE);
+    lives_widget_set_sensitive (mainw->undo, TRUE);
     if (rfx->num_in_channels>0) cfile->undoable=TRUE;
     cfile->pb_fps=old_pb_fps;
     mainw->internal_messaging=FALSE;
-    if (rfx->num_in_channels>0) gtk_widget_set_sensitive (mainw->select_last, TRUE);
+    if (rfx->num_in_channels>0) lives_widget_set_sensitive (mainw->select_last, TRUE);
     if (rfx->num_in_channels>0) set_undoable (rfx->menu_text,TRUE);
   }
 
@@ -765,7 +765,7 @@
       lives_widget_context_update();
       gdk_window_raise(lives_widget_get_xwindow(resaudw->dialog));
 
-      if (gtk_dialog_run(GTK_DIALOG(resaudw->dialog))!=GTK_RESPONSE_OK) return FALSE;
+      if (lives_dialog_run(GTK_DIALOG(resaudw->dialog))!=GTK_RESPONSE_OK) return FALSE;
       if (mainw->error) {
 	mainw->error=FALSE;
 	return FALSE;
@@ -1076,9 +1076,9 @@
 						       (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||
 						       mainw->agen_key!=0)) {
 
-    gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
+    lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
   }
-  else gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+  else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
 
 
   return TRUE;

LiVES-2.0.3.tar.bz2/src/events.c -> LiVES-2.0.4.tar.bz2/src/events.c Changed

@@ -2065,14 +2065,14 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(e_rec_dialog));
 
   vbox = lives_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
   label = lives_standard_label_new (_("Events were recorded. What would you like to do with them ?"));
 
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, widget_opts.packing_height*2);
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   radiobutton = lives_standard_radio_button_new (_ ("_Preview events"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
@@ -2086,7 +2086,7 @@
   if (!mainw->clip_switched&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
 
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+    lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
     radiobutton = lives_standard_radio_button_new (_ ("Render events to _same clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
     radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
@@ -2098,7 +2098,7 @@
 
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   radiobutton = lives_standard_radio_button_new (_ ("Render events to _new clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
@@ -2110,7 +2110,7 @@
 
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _multitrack window (test)"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
@@ -2119,17 +2119,17 @@
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_MULTITRACK));
 
-  if (!allow_mt) gtk_widget_set_sensitive(radiobutton,FALSE);
+  if (!allow_mt) lives_widget_set_sensitive(radiobutton,FALSE);
 
 
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _event window"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-  if (mainw->stored_event_list!=NULL) gtk_widget_set_sensitive(radiobutton,FALSE);
+  if (mainw->stored_event_list!=NULL) lives_widget_set_sensitive(radiobutton,FALSE);
     
   g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
 		    G_CALLBACK (set_render_choice),
@@ -2138,24 +2138,24 @@
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   lives_widget_set_can_focus (cancelbutton,TRUE);
 
-  gtk_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		    G_CALLBACK (set_render_choice_button),
 		    GINT_TO_POINTER (RENDER_CHOICE_DISCARD));
 
-  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+  accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
+  lives_widget_add_accelerator (cancelbutton, "activate", accel_group,
                               LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   gtk_window_add_accel_group (GTK_WINDOW (e_rec_dialog), accel_group);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), okbutton, GTK_RESPONSE_OK);
+  lives_widget_show (okbutton);
+  lives_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), okbutton, GTK_RESPONSE_OK);
   lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
-  gtk_widget_show_all (e_rec_dialog);
+  lives_widget_show_all (e_rec_dialog);
 
   return e_rec_dialog;
 
@@ -2944,7 +2944,7 @@
     if (mainw->playing_file>-1&&!mainw->noframedrop&&next_tc<=curr_tc) break;
     if (!mainw->fs&&prefs->show_framecount) {
       g_signal_handler_block(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
+      lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
       g_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
     }
   }
@@ -3397,8 +3397,8 @@
 	  cfile->asampsize=cfile->undo_asampsize;
 	  if (cfile->proc_ptr!=NULL) {
 	    blabel=g_strdup(gtk_label_get_text(GTK_LABEL(cfile->proc_ptr->label)));
-	    gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
-	    gtk_widget_queue_draw(cfile->proc_ptr->processing);
+	    lives_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
+	    lives_widget_queue_draw(cfile->proc_ptr->processing);
 	    lives_widget_context_update();
 	  }
 
@@ -3423,9 +3423,9 @@
 	  }
 
 	  if (cfile->proc_ptr!=NULL) {
-	    gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
+	    lives_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
 	    g_free(blabel);
-	    gtk_widget_queue_draw(cfile->proc_ptr->processing);
+	    lives_widget_queue_draw(cfile->proc_ptr->processing);
 	    lives_widget_context_update();
 	  }
 	}
@@ -3472,8 +3472,8 @@
 
 		if (cfile->proc_ptr!=NULL) {
 		  blabel=g_strdup(gtk_label_get_text(GTK_LABEL(cfile->proc_ptr->label)));
-		  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
-		  gtk_widget_queue_draw(cfile->proc_ptr->processing);
+		  lives_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
+		  lives_widget_queue_draw(cfile->proc_ptr->processing);
 		  lives_widget_context_update();
 		}
 
@@ -3499,9 +3499,9 @@
 		}
 
 		if (cfile->proc_ptr!=NULL) {
-		  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
+		  lives_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
 		  g_free(blabel);
-		  gtk_widget_queue_draw(cfile->proc_ptr->processing);
+		  lives_widget_queue_draw(cfile->proc_ptr->processing);
 		  lives_widget_context_update();
 		}
 
@@ -3794,8 +3794,8 @@
   cfile->pb_fps=1000000.;
 
   cfile->redoable=cfile->undoable=FALSE;
-  gtk_widget_set_sensitive (mainw->redo, FALSE);
-  gtk_widget_set_sensitive (mainw->undo, FALSE);
+  lives_widget_set_sensitive (mainw->redo, FALSE);
+  lives_widget_set_sensitive (mainw->undo, FALSE);
 
   cfile->undo_action=UNDO_RENDER;
   // play back the file as fast as possible, each time calling render_events()
@@ -3832,10 +3832,10 @@
     return FALSE;
   }
 
-  gtk_widget_set_sensitive (mainw->undo, TRUE);
+  lives_widget_set_sensitive (mainw->undo, TRUE);
   cfile->undoable=TRUE;
   cfile->pb_fps=old_pb_fps;
-  gtk_widget_set_sensitive (mainw->select_last, TRUE);
+  lives_widget_set_sensitive (mainw->select_last, TRUE);
   set_undoable (_ ("rendering"),TRUE);
   cfile->next_event=NULL;
   return TRUE;
@@ -3959,19 +3959,19 @@
 
       if (!has_audio_frame(mainw->event_list)) {
 	lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), FALSE);
-	gtk_widget_set_sensitive(resaudw->aud_checkbutton,FALSE);
+	lives_widget_set_sensitive(resaudw->aud_checkbutton,FALSE);
       }
       rdet->enc_changed=FALSE;
       do {
 	rdet->suggestion_followed=FALSE;
-	if ((response=gtk_dialog_run(GTK_DIALOG(rdet->dialog)))==GTK_RESPONSE_OK) if (rdet->enc_changed) {
+	if ((response=lives_dialog_run(GTK_DIALOG(rdet->dialog)))==GTK_RESPONSE_OK) if (rdet->enc_changed) {
 	    check_encoder_restrictions(FALSE,TRUE,TRUE);
 	}
       } while (rdet->suggestion_followed);
 
-      xarate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-      xachans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-      xasamps=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+      xarate=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+      xachans=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+      xasamps=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
 
       rendaud=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton));

LiVES-2.0.3.tar.bz2/src/framedraw.c -> LiVES-2.0.4.tar.bz2/src/framedraw.c Changed

@@ -49,7 +49,7 @@
   int i;
   gchar *com;
 
-  gtk_widget_set_sensitive(mainw->framedraw_preview,FALSE);
+  lives_widget_set_sensitive(mainw->framedraw_preview,FALSE);
   lives_widget_context_update();
 
   if (mainw->did_rfx_preview) {
@@ -98,11 +98,11 @@
   // within do_effect() we check and if  
   do_effect(rfx,TRUE); // actually start effect processing in the background
 
-  gtk_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
-  gtk_widget_set_sensitive(mainw->framedraw_scale,TRUE);
+  lives_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
+  lives_widget_set_sensitive(mainw->framedraw_scale,TRUE);
 
   if (mainw->framedraw_frame>cfile->start&&!(cfile->start==0&&mainw->framedraw_frame==1)) 
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->framedraw_spinbutton),cfile->start);
+    lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->framedraw_spinbutton),cfile->start);
   else {
     load_rfx_preview(rfx);
   }
@@ -154,7 +154,7 @@
 
   // TRANSLATORS - Preview refers to preview window; keep this phrase short
   label=lives_standard_label_new(_("You can click in Preview to change these values"));
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
 }
 
 
@@ -165,12 +165,12 @@
 
   mainw->framedraw_reset = gtk_button_new_from_stock ("gtk-refresh");
   hbox_rst = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (box), hbox_rst, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (box), hbox_rst, FALSE, FALSE, 0);
   
-  gtk_button_set_label (GTK_BUTTON (mainw->framedraw_reset),_ ("_Reset Values"));
+  lives_button_set_label (GTK_BUTTON (mainw->framedraw_reset),_ ("_Reset Values"));
   gtk_button_set_use_underline (GTK_BUTTON (mainw->framedraw_reset), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox_rst), mainw->framedraw_reset, TRUE, FALSE, 0);
-  gtk_widget_set_sensitive (mainw->framedraw_reset,FALSE);
+  lives_box_pack_start (GTK_BOX (hbox_rst), mainw->framedraw_reset, TRUE, FALSE, 0);
+  lives_widget_set_sensitive (mainw->framedraw_reset,FALSE);
   
   g_signal_connect (mainw->framedraw_reset, "clicked",G_CALLBACK (on_framedraw_reset_clicked),framedraw);
 }
@@ -204,28 +204,28 @@
   mainw->framedraw_reset=NULL;
 
   vseparator = lives_vseparator_new ();
-  gtk_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vseparator, FALSE, FALSE, 0);
-  gtk_widget_show (vseparator);
+  lives_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vseparator, FALSE, FALSE, 0);
+  lives_widget_show (vseparator);
 
   vbox = lives_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vbox, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width);
+  lives_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vbox, FALSE, FALSE, 0);
+  lives_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width);
 
   fd_scale=calc_fd_scale(width,height);
   width/=fd_scale;
   height/=fd_scale;
  
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   add_fill_to_box(GTK_BOX(hbox));
 
   fbord_eventbox=gtk_event_box_new();
-  gtk_container_set_border_width(GTK_CONTAINER(fbord_eventbox),widget_opts.border_width);
+  lives_container_set_border_width(GTK_CONTAINER(fbord_eventbox),widget_opts.border_width);
 
   frame = gtk_frame_new (NULL);
 
   add_fill_to_box(GTK_BOX(hbox));
-  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color (fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
@@ -241,16 +241,16 @@
   gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_NONE);
 
   mainw->framedraw=gtk_event_box_new();
-  gtk_widget_set_size_request (mainw->framedraw, width, height);
-  gtk_container_set_border_width(GTK_CONTAINER(mainw->framedraw),1);
+  lives_widget_set_size_request (mainw->framedraw, width, height);
+  lives_container_set_border_width(GTK_CONTAINER(mainw->framedraw),1);
 
   gtk_widget_set_events (mainw->framedraw, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | 
 			 GDK_BUTTON_PRESS_MASK| GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
 
   mainw->framedraw_frame=start;
 
-  gtk_container_add (GTK_CONTAINER (frame), fbord_eventbox);
-  gtk_container_add (GTK_CONTAINER (fbord_eventbox), mainw->framedraw);
+  lives_container_add (GTK_CONTAINER (frame), fbord_eventbox);
+  lives_container_add (GTK_CONTAINER (fbord_eventbox), mainw->framedraw);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
@@ -262,7 +262,7 @@
 
 
   hbox = lives_hbox_new (FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   mainw->framedraw_spinbutton = lives_standard_spin_button_new (_("_Frame"),
 								TRUE,start,start,end,1.,10.,0,LIVES_BOX(hbox),NULL);
@@ -270,22 +270,22 @@
   spinbutton_adj=gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(mainw->framedraw_spinbutton));
 
   mainw->framedraw_scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->framedraw_scale, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (hbox), mainw->framedraw_scale, TRUE, TRUE, 0);
   gtk_scale_set_draw_value(GTK_SCALE(mainw->framedraw_scale),FALSE);
 
-  rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(gtk_widget_get_toplevel(GTK_WIDGET(box))),"rfx");
+  rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(lives_widget_get_toplevel(GTK_WIDGET(box))),"rfx");
   mainw->framedraw_preview = gtk_button_new_from_stock ("gtk-refresh");
-  gtk_button_set_label (GTK_BUTTON (mainw->framedraw_preview),_ ("_Preview"));
+  lives_button_set_label (GTK_BUTTON (mainw->framedraw_preview),_ ("_Preview"));
   gtk_button_set_use_underline (GTK_BUTTON (mainw->framedraw_preview), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->framedraw_preview, TRUE, FALSE, 0);
-  gtk_widget_set_sensitive(mainw->framedraw_spinbutton,FALSE);
-  gtk_widget_set_sensitive(mainw->framedraw_scale,FALSE);
+  lives_box_pack_start (GTK_BOX (hbox), mainw->framedraw_preview, TRUE, FALSE, 0);
+  lives_widget_set_sensitive(mainw->framedraw_spinbutton,FALSE);
+  lives_widget_set_sensitive(mainw->framedraw_scale,FALSE);
   g_signal_connect (mainw->framedraw_preview, "clicked",G_CALLBACK (start_preview),rfx);
   
-  gtk_widget_show_all (vbox);
+  lives_widget_show_all (vbox);
 
   if (!add_preview_button) {
-    gtk_widget_hide(mainw->framedraw_preview);
+    lives_widget_hide(mainw->framedraw_preview);
   }
 
 }
@@ -341,38 +341,38 @@
   case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: // deprecated
     // scale values
     if (framedraw->xstart_param->dp==0) {
-      xstartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=(double)lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
       xstartf=xstartf/(double)cfile->hsize*(double)width;
     }
     else {
-      xstartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=lives_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
       xstartf=xstartf*(double)width;
     }
 
     if (framedraw->xend_param->dp==0) {
-      xendf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=(double)lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
       xendf=xendf/(double)cfile->hsize*(double)width;
     }
     else {
-      xendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=lives_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
       xendf=xendf*(double)width;
     }
 
     if (framedraw->ystart_param->dp==0) {
-      ystartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=(double)lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
       ystartf=ystartf/(double)cfile->vsize*(double)height;
     }
     else {
-      ystartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=lives_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
       ystartf=ystartf*(double)height;
     }
 
     if (framedraw->yend_param->dp==0) {
-      yendf=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
       yendf=yendf/(double)cfile->vsize*(double)height;
     }
     else {
-      yendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=lives_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
       yendf=yendf*(double)height;
     }
 
@@ -385,38 +385,38 @@
   case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
 
     if (framedraw->xstart_param->dp==0) {
-      xstartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=(double)lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));

LiVES-2.0.3.tar.bz2/src/gui.c -> LiVES-2.0.4.tar.bz2/src/gui.c Changed

@@ -65,7 +65,7 @@
     g_error_free(error);
   }
   else {
-    mainw->sep_image = gtk_image_new_from_pixbuf (mainw->imsep);
+    mainw->sep_image = lives_image_new_from_pixbuf (mainw->imsep);
     tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,prefs->theme,"frame.jpg",NULL);
     mainw->imframe=gdk_pixbuf_new_from_file(tmp,&error);
     g_free(tmp);
@@ -87,23 +87,23 @@
     gtk_text_buffer_get_start_iter(tbuff,&start_iter);
     gtk_text_buffer_get_end_iter(tbuff,&end_iter);
     all_text=gtk_text_buffer_get_text(tbuff,&start_iter,&end_iter,TRUE);
-    gtk_widget_destroy(mainw->textview1);
+    lives_widget_destroy(mainw->textview1);
   }
 
   if (mainw->scrolledwindow!=NULL) {
-    gtk_widget_destroy(mainw->scrolledwindow);
+    lives_widget_destroy(mainw->scrolledwindow);
   }
 
   mainw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mainw->scrolledwindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS);
-  gtk_widget_show (mainw->scrolledwindow);
+  lives_widget_show (mainw->scrolledwindow);
   lives_widget_set_vexpand(mainw->scrolledwindow,TRUE);
 
-  gtk_container_add (GTK_CONTAINER(conter), mainw->scrolledwindow);
+  lives_container_add (GTK_CONTAINER(conter), mainw->scrolledwindow);
 
   mainw->textview1 = gtk_text_view_new ();
-  gtk_widget_show (mainw->textview1);
-  gtk_container_add (GTK_CONTAINER (mainw->scrolledwindow), mainw->textview1);
+  lives_widget_show (mainw->textview1);
+  lives_container_add (GTK_CONTAINER (mainw->scrolledwindow), mainw->textview1);
 
   tbuff=gtk_text_view_get_buffer(GTK_TEXT_VIEW(mainw->textview1));
   if (tbuff!=NULL && all_text!=NULL) {
@@ -117,7 +117,7 @@
     gtk_text_buffer_delete_mark (tbuff,mark);
   }
 
-  gtk_widget_set_size_request (mainw->textview1, -1, MSG_AREA_HEIGHT);
+  lives_widget_set_size_request (mainw->textview1, -1, MSG_AREA_HEIGHT);
   gtk_text_view_set_editable (GTK_TEXT_VIEW (mainw->textview1), FALSE);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (mainw->textview1), GTK_WRAP_WORD);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (mainw->textview1), FALSE);
@@ -130,9 +130,9 @@
 
 
 void make_custom_submenus(void) {
-  mainw->custom_gens_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Generators"));
-  mainw->custom_effects_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Effects"));
-  mainw->custom_utilities_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Utilities"));
+  mainw->custom_gens_submenu = lives_menu_item_new_with_mnemonic (_ ("_Custom Generators"));
+  mainw->custom_effects_submenu = lives_menu_item_new_with_mnemonic (_ ("_Custom Effects"));
+  mainw->custom_utilities_submenu = lives_menu_item_new_with_mnemonic (_("Custom _Utilities"));
 
 }
 
@@ -253,13 +253,13 @@
 
   mainw->preview_image=NULL;
 
-  mainw->sep_image = gtk_image_new_from_pixbuf (NULL);
-  mainw->image272 = gtk_image_new_from_pixbuf (NULL);
-  mainw->image273 = gtk_image_new_from_pixbuf (NULL);
+  mainw->sep_image = lives_image_new_from_pixbuf (NULL);
+  mainw->image272 = lives_image_new_from_pixbuf (NULL);
+  mainw->image273 = lives_image_new_from_pixbuf (NULL);
   mainw->imframe=mainw->imsep=NULL;
 
-  gtk_widget_show(mainw->image272);
-  gtk_widget_show(mainw->image273);
+  lives_widget_show(mainw->image272);
+  lives_widget_show(mainw->image273);
 
   if (palette->style&STYLE_1) {
     load_theme();
@@ -279,13 +279,13 @@
 #else
 
   if (mainw->imframe!=NULL) {
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe);
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe);
+    lives_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe);
+    lives_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe);
   }
 
 #endif
 
-  mainw->accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  mainw->accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
 
   mainw->layout_textbuffer=gtk_text_buffer_new(NULL);
   g_object_ref(mainw->layout_textbuffer);
@@ -294,7 +294,7 @@
   mainw->LiVES = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
   if (prefs->present) 
-    gtk_window_present(GTK_WINDOW(mainw->LiVES));
+    lives_window_present(GTK_WINDOW(mainw->LiVES));
 
   // TODO - can we use just DEFAULT_DROP ?
   gtk_drag_dest_set(mainw->LiVES,GTK_DEST_DEFAULT_ALL,mainw->target_table,2,
@@ -322,143 +322,143 @@
   }
 
  
-  gtk_window_set_title (GTK_WINDOW (mainw->LiVES), "LiVES");
+  lives_window_set_title (GTK_WINDOW (mainw->LiVES), "LiVES");
 
   mainw->vbox1 = lives_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (mainw->LiVES), mainw->vbox1);
-  gtk_widget_show (mainw->vbox1);
+  lives_container_add (GTK_CONTAINER (mainw->LiVES), mainw->vbox1);
+  lives_widget_show (mainw->vbox1);
 
   mainw->menu_hbox = lives_hbox_new (FALSE, 0);
-  gtk_widget_show (mainw->menu_hbox);
-  gtk_box_pack_start (GTK_BOX (mainw->vbox1), mainw->menu_hbox, FALSE, FALSE, 0);
+  lives_widget_show (mainw->menu_hbox);
+  lives_box_pack_start (GTK_BOX (mainw->vbox1), mainw->menu_hbox, FALSE, FALSE, 0);
 
   mainw->menubar = gtk_menu_bar_new ();
-  gtk_widget_show (mainw->menubar);
-  gtk_box_pack_start (GTK_BOX (mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
+  lives_widget_show (mainw->menubar);
+  lives_box_pack_start (GTK_BOX (mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  menuitem = gtk_menu_item_new_with_mnemonic (_("_File"));
-  gtk_widget_show (menuitem);
-  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic (_("_File"));
+  lives_widget_show (menuitem);
+  lives_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
 
-  menuitem_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new ();
+  lives_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  mainw->open = gtk_menu_item_new_with_mnemonic (_("_Open File/Directory"));
-  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open);
-  gtk_widget_add_accelerator (mainw->open, "activate", mainw->accel_group,
+  mainw->open = lives_menu_item_new_with_mnemonic (_("_Open File/Directory"));
+  lives_container_add (GTK_CONTAINER (menuitem_menu), mainw->open);
+  lives_widget_add_accelerator (mainw->open, "activate", mainw->accel_group,
                               LIVES_KEY_o, LIVES_CONTROL_MASK,
-                              GTK_ACCEL_VISIBLE);
+                              LIVES_ACCEL_VISIBLE);
 
-  mainw->open_sel = gtk_menu_item_new_with_mnemonic (_("O_pen Part of File..."));
+  mainw->open_sel = lives_menu_item_new_with_mnemonic (_("O_pen Part of File..."));
 
-  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_sel);
+  lives_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_sel);
 
 
 
-  mainw->open_loc = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
+  mainw->open_loc = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
 
 #ifdef HAVE_WEBM
 
-  mainw->open_loc_menu = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc_menu);
+  mainw->open_loc_menu = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
+  lives_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc_menu);
 
-  mainw->open_loc_submenu=gtk_menu_new();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_loc_menu), mainw->open_loc_submenu);
+  mainw->open_loc_submenu=lives_menu_new();
+  lives_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_loc_menu), mainw->open_loc_submenu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  mainw->open_utube = gtk_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
-  gtk_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_utube);
+  mainw->open_utube = lives_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
+  lives_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_utube);
 
-  gtk_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_loc);
+  lives_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_loc);
 
 #else
 
-  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc);
+  lives_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc);

LiVES-2.0.3.tar.bz2/src/interface.c -> LiVES-2.0.4.tar.bz2/src/interface.c Changed

@@ -4,8 +4,8 @@
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
-// TODO - use gtk_widget_showall where poss.
-// and don't forget gtk_box_pack_end (doh)
+// TODO - use lives_widget_showall where poss.
+// and don't forget lives_box_pack_end (doh)
 // and just use label instead of labelnn, etc.
 
 
@@ -50,34 +50,34 @@
 
   if (LIVES_IS_HBOX(for_deint)) {
     GtkWidget *filler;
-    gtk_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_width);
     gtk_box_reorder_child(for_deint, hbox, 0);
     filler=add_fill_to_box(LIVES_BOX(for_deint));
     if (filler!=NULL) gtk_box_reorder_child(for_deint, filler, 1);
   }
-  else gtk_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_height);
+  else lives_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_height);
 
   lives_widget_set_can_focus_and_default (checkbutton);
   lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->open_deint);
   g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			  G_CALLBACK (on_boolean_toggled),
 			  &mainw->open_deint);
-  gtk_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
+  lives_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
 
-  gtk_widget_show_all(GTK_WIDGET(for_deint));
+  lives_widget_show_all(GTK_WIDGET(for_deint));
 
   return hbox;
 }
 
 
 static void pv_sel_changed(GtkFileChooser *chooser, gpointer user_data) {
-  GSList *slist=gtk_file_chooser_get_filenames (chooser);
+  GSList *slist=lives_file_chooser_get_filenames (chooser);
   GtkWidget *pbutton=(GtkWidget *)user_data;
 
   if (slist==NULL||slist->data==NULL||g_slist_length(slist)>1||!(g_file_test((gchar *)slist->data,G_FILE_TEST_IS_REGULAR))) {
-    gtk_widget_set_sensitive(pbutton,FALSE);
+    lives_widget_set_sensitive(pbutton,FALSE);
   }
-  else gtk_widget_set_sensitive(pbutton,TRUE);
+  else lives_widget_set_sensitive(pbutton,TRUE);
   
   if (slist!=NULL) {
     g_list_free_strings((GList *)slist);
@@ -103,44 +103,44 @@
 
   if (preview_type==1||preview_type==3) {
 
-    gtk_widget_show (mainw->fs_playframe);
-    gtk_widget_show (mainw->fs_playalign);
+    lives_widget_show (mainw->fs_playframe);
+    lives_widget_show (mainw->fs_playalign);
 
-    gtk_container_set_border_width (GTK_CONTAINER(mainw->fs_playframe), widget_opts.border_width);
+    lives_container_set_border_width (GTK_CONTAINER(mainw->fs_playframe), widget_opts.border_width);
 
     widget_opts.justify=LIVES_JUSTIFY_RIGHT;
     fs_label = lives_standard_label_new (_ ("Preview"));
     widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-    gtk_widget_show (fs_label);
+    lives_widget_show (fs_label);
     gtk_frame_set_label_widget (GTK_FRAME (mainw->fs_playframe), fs_label);
 
-    gtk_box_pack_start (for_preview, mainw->fs_playframe, FALSE, FALSE, 0);
-    gtk_widget_set_size_request (mainw->fs_playarea, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
+    lives_box_pack_start (for_preview, mainw->fs_playframe, FALSE, FALSE, 0);
+    lives_widget_set_size_request (mainw->fs_playarea, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
 
-    gtk_container_add (GTK_CONTAINER (mainw->fs_playframe), mainw->fs_playalign);
-    gtk_container_add (GTK_CONTAINER (mainw->fs_playalign), mainw->fs_playarea);
+    lives_container_add (GTK_CONTAINER (mainw->fs_playframe), mainw->fs_playalign);
+    lives_container_add (GTK_CONTAINER (mainw->fs_playalign), mainw->fs_playarea);
 
     lives_widget_set_bg_color (mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
     lives_widget_set_bg_color (mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
     lives_widget_set_bg_color (mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
 
-    gtk_widget_show(mainw->fs_playarea);
+    lives_widget_show(mainw->fs_playarea);
    }
 
   if (preview_type==1) {
-    preview_button = gtk_button_new_with_mnemonic (_ ("Click here to _Preview any selected video, image or audio file"));
+    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview any selected video, image or audio file"));
   }
   else if (preview_type==2) {
-    preview_button = gtk_button_new_with_mnemonic (_ ("Click here to _Preview any selected audio file"));
+    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview any selected audio file"));
   }
   else if (preview_type==3) {
-    preview_button = gtk_button_new_with_mnemonic (_ ("Click here to _Preview the video"));
+    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview the video"));
   }
 
-  gtk_widget_show (preview_button);
+  lives_widget_show (preview_button);
 
 
-  gtk_box_pack_start (for_button, preview_button, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start (for_button, preview_button, FALSE, FALSE, widget_opts.packing_width);
 
   if (preview_type==1||preview_type==3) {
     add_deinterlace_checkbox(for_deint);
@@ -152,7 +152,7 @@
 		    GINT_TO_POINTER (preview_type));
 
   if (GTK_IS_FILE_CHOOSER(widget)) {
-    gtk_widget_set_sensitive(preview_button,FALSE);
+    lives_widget_set_sensitive(preview_button,FALSE);
     
     g_signal_connect (GTK_OBJECT (widget), "selection_changed",
 		      G_CALLBACK (pv_sel_changed),
@@ -170,7 +170,7 @@
   GtkWidget *dialog_action_area;
   GtkWidget *details_arrow;
 
-  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(lives_accel_group_new ());
 
   xprocess *procw=(xprocess*)(g_malloc(sizeof(xprocess)));
 
@@ -188,25 +188,25 @@
   }
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(procw->processing));
-  gtk_widget_show (dialog_vbox);
+  lives_widget_show (dialog_vbox);
 
   vbox2 = lives_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox2, TRUE, TRUE, 0);
+  lives_widget_show (vbox2);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), vbox2, TRUE, TRUE, 0);
 
   vbox3 = lives_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox3);
-  gtk_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0);
+  lives_widget_show (vbox3);
+  lives_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0);
 
   g_snprintf(tmp_label,256,"%s...\n",text);
   procw->label = lives_standard_label_new (tmp_label);
-  gtk_widget_show (procw->label);
+  lives_widget_show (procw->label);
 
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (vbox3), procw->label, TRUE, TRUE, 0);
 
   procw->progressbar = gtk_progress_bar_new ();
-  gtk_widget_show (procw->progressbar);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->progressbar, FALSE, FALSE, 0);
+  lives_widget_show (procw->progressbar);
+  lives_box_pack_start (GTK_BOX (vbox3), procw->progressbar, FALSE, FALSE, 0);
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(procw->progressbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
@@ -221,14 +221,14 @@
   else procw->label2=lives_standard_label_new (_("\nPlease Wait"));
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  gtk_widget_show (procw->label2);
+  lives_widget_show (procw->label2);
 
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label2, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox3), procw->label2, FALSE, FALSE, 0);
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
   procw->label3 = lives_standard_label_new (PROCW_STRETCHER);
-  gtk_widget_show (procw->label3);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label3, FALSE, FALSE, 0);
+  lives_widget_show (procw->label3);
+  lives_box_pack_start (GTK_BOX (vbox3), procw->label3, FALSE, FALSE, 0);
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
   if (mainw->iochan!=NULL) {
@@ -240,28 +240,28 @@
 
     details_arrow=lives_standard_expander_new(_("Show Details"),FALSE,LIVES_BOX(vbox3),procw->scrolledwindow);
 
-    gtk_widget_show_all(details_arrow);
+    lives_widget_show_all(details_arrow);
 
   }
 
 
-  gtk_widget_show_all(vbox3);
+  lives_widget_show_all(vbox3);
 
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (procw->processing));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);

LiVES-2.0.3.tar.bz2/src/keyboard.c -> LiVES-2.0.4.tar.bz2/src/keyboard.c Changed

@@ -189,7 +189,7 @@
   // we also auto-repeat our cached keys
   if (cached_key&&current_kb_time-last_kb_time>KEY_RPT_INTERVAL*10) {
     last_kb_time=current_kb_time;
-    gtk_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)cached_key, (GdkModifierType)cached_mod);
+    lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)cached_key, (GdkModifierType)cached_mod);
   }
 
   return TRUE;
@@ -313,8 +313,8 @@
 
   if (mainw->ext_keyboard) {
     if (cached_key) return FALSE;
-    if (mainw->multitrack==NULL) gtk_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)unicode,state);
-    else gtk_accel_groups_activate (G_OBJECT (mainw->multitrack->window),(guint)unicode,state);
+    if (mainw->multitrack==NULL) lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)unicode,state);
+    else lives_accel_groups_activate (G_OBJECT (mainw->multitrack->window),(guint)unicode,state);
     if (!mainw->ext_keyboard) return TRUE; // if user switched out of ext_keyboard, do no further processing *
   }
 
@@ -382,17 +382,17 @@
 }
 
 gboolean showfct_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
-  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showfct),!prefs->show_framecount);
+  lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showfct),!prefs->show_framecount);
   return TRUE;
 }
 
 gboolean showsubs_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
-  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),!prefs->show_subtitles);
+  lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),!prefs->show_subtitles);
   return TRUE;
 }
 
 gboolean loop_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
-  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+  lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
   return TRUE;
 }
 
@@ -402,7 +402,7 @@
 }
 
 gboolean rec_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
-  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->record_perf)));
+  lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->record_perf)));
   return TRUE;
 }

LiVES-2.0.3.tar.bz2/src/ldvcallbacks.c -> LiVES-2.0.4.tar.bz2/src/ldvcallbacks.c Changed

@@ -17,13 +17,13 @@
   if (dvgrabw->filename!=NULL) g_free(dvgrabw->filename);
   dvgrabw->filename=find_free_camfile(cam->format);
   if (dvgrabw->filename==NULL) return;
-  gtk_widget_set_sensitive(dvgrabw->grab,FALSE);
+  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);
   msg=g_strdup_printf(_("Recording to %s/%s"),dvgrabw->dirname,dvgrabw->filename);
-  gtk_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),msg);
+  lives_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),msg);
   if (cam->format==CAM_FORMAT_DV) {
-    dvgrabw->filename=g_strdup(gtk_entry_get_text(GTK_ENTRY(dvgrabw->filent)));
+    dvgrabw->filename=g_strdup(lives_entry_get_text(GTK_ENTRY(dvgrabw->filent)));
   }
   rec(cam);
   cam->grabbed_clips=TRUE;
@@ -32,7 +32,7 @@
 
 void on_camstop_clicked (GtkButton *button, gpointer user_data) {
   s_cam *cam=(s_cam *)user_data;
-  gtk_widget_set_sensitive(dvgrabw->stop,FALSE);
+  lives_widget_set_sensitive(dvgrabw->stop,FALSE);
   dvgrabw->playing=FALSE;
 
   if (cam->format==CAM_FORMAT_DV) {
@@ -42,9 +42,9 @@
 
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,dvgrabw->dialog);
   camstop(cam);
-  gtk_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-play");
-  gtk_widget_set_sensitive(dvgrabw->grab,TRUE);
-  gtk_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
+  lives_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-play");
+  lives_widget_set_sensitive(dvgrabw->grab,TRUE);
+  lives_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
 }
 
 
@@ -53,25 +53,25 @@
   camplay(cam);
   dvgrabw->playing=!dvgrabw->playing;
   if (dvgrabw->playing) {
-    gtk_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-pause");
+    lives_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-pause");
   }
   else {
-    gtk_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-play");
+    lives_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-play");
   }
-  gtk_widget_set_sensitive(dvgrabw->stop,TRUE);
+  lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
 void on_camrew_clicked (GtkButton *button, gpointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camrew(cam);
-  gtk_widget_set_sensitive(dvgrabw->stop,TRUE);
+  lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
 
 void on_camff_clicked (GtkButton *button, gpointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camff(cam);
-  gtk_widget_set_sensitive(dvgrabw->stop,TRUE);
+  lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
 void on_cameject_clicked (GtkButton *button, gpointer user_data) {
@@ -90,7 +90,7 @@
   s_cam *cam=(s_cam *)user_data;
   on_camstop_clicked(button,user_data);
   //if (cam->format==CAM_FORMAT_HDV) close_raw1394(cam->rec_handle);
-  gtk_widget_destroy(dvgrabw->dialog);
+  lives_widget_destroy(dvgrabw->dialog);
   if (dvgrabw->cursor!=NULL) lives_cursor_unref(dvgrabw->cursor);
   if (dvgrabw->filename!=NULL) g_free(dvgrabw->filename);
   if (dvgrabw->dirname!=NULL) g_free(dvgrabw->dirname);

LiVES-2.0.3.tar.bz2/src/ldvgrab.c -> LiVES-2.0.4.tar.bz2/src/ldvgrab.c Changed

LiVES-2.0.3.tar.bz2/src/ldvinterface.c -> LiVES-2.0.4.tar.bz2/src/ldvinterface.c Changed

@@ -32,7 +32,7 @@
   dvgrabw->dialog = lives_standard_dialog_new (_("LiVES: DVGrab"),FALSE);
   dvgrabw->playing=FALSE;
 
-  gtk_container_set_border_width (GTK_CONTAINER (dvgrabw->dialog), widget_opts.border_width*2);
+  lives_container_set_border_width (GTK_CONTAINER (dvgrabw->dialog), widget_opts.border_width*2);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(dvgrabw->dialog),GTK_WINDOW(mainw->LiVES));
@@ -42,15 +42,15 @@
   vbox=lives_dialog_get_content_area(LIVES_DIALOG(dvgrabw->dialog));
 
   hbox = lives_hbox_new (FALSE,0);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
+  lives_box_pack_start(GTK_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);
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
+  lives_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
 
-  gtk_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
+  lives_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
   direntry=lives_standard_entry_new(NULL,FALSE,(tmp=g_filename_to_utf8(g_get_current_dir(),-1,NULL,NULL,NULL)),-1,PATH_MAX,
 				    LIVES_BOX(hbox),NULL);
@@ -64,19 +64,19 @@
   //////////////////
 
   hbox = lives_hbox_new (FALSE,0);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
+  lives_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
   dvgrabw->filent=lives_standard_entry_new(_("File_name:"),TRUE,type==CAM_FORMAT_DV?"dvgrab-":"hdvgrab-",-1,-1,LIVES_BOX(hbox),NULL);
 
   if (type==CAM_FORMAT_DV) label=lives_standard_label_new("%d.dv");
   else label=lives_standard_label_new("%d.mpg");
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
+  lives_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
 
   label=lives_standard_label_new(_("(files will not be overwritten)"));
-  gtk_box_pack_end(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
+  lives_box_pack_end(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   dvgrabw->split=lives_standard_check_button_new(_("_Split into scenes"),TRUE,LIVES_BOX(hbox),NULL);
 
@@ -84,15 +84,15 @@
   // TODO - widget_opts.editable
   dvgrabw->status_entry=gtk_entry_new();
 
-  gtk_box_pack_start(GTK_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,widget_opts.packing_height);
-  gtk_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
+  lives_box_pack_start(GTK_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,widget_opts.packing_height);
+  lives_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
   gtk_editable_set_editable (GTK_EDITABLE(dvgrabw->status_entry),FALSE);
 
   add_hsep_to_box(LIVES_BOX(vbox));
 
   hbuttonbox1 = lives_hbutton_box_new ();
 
-  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox1,FALSE,FALSE,widget_opts.packing_height);
+  lives_box_pack_start(GTK_BOX(vbox),hbuttonbox1,FALSE,FALSE,widget_opts.packing_height);
 
 #if GTK_CHECK_VERSION(2,6,0)
   button3 = gtk_button_new_from_stock (GTK_STOCK_MEDIA_REWIND);
@@ -100,7 +100,7 @@
   button3 = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
 #endif
 
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), button3);
+  lives_container_add (GTK_CONTAINER (hbuttonbox1), button3);
   lives_widget_set_can_focus (button3,TRUE);
 
 #if GTK_CHECK_VERSION(2,6,0)
@@ -108,7 +108,7 @@
 #else
   button4 = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
 #endif
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), button4);
+  lives_container_add (GTK_CONTAINER (hbuttonbox1), button4);
   lives_widget_set_can_focus (button4,TRUE);
 
 #if GTK_CHECK_VERSION(2,6,0)
@@ -116,16 +116,16 @@
 #else
   dvgrabw->stop = gtk_button_new_from_stock (GTK_STOCK_STOP);
 #endif
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->stop);
+  lives_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->stop);
   lives_widget_set_can_focus_and_default (dvgrabw->stop);
-  gtk_widget_set_sensitive(dvgrabw->stop,FALSE);
+  lives_widget_set_sensitive(dvgrabw->stop,FALSE);
 
 #if GTK_CHECK_VERSION(2,6,0)
   dvgrabw->play = gtk_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
 #else
   dvgrabw->play = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
 #endif
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->play);
+  lives_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->play);
   lives_widget_set_can_focus_and_default (dvgrabw->play);
   gtk_button_set_use_stock(GTK_BUTTON(dvgrabw->play),TRUE);
 
@@ -134,7 +134,7 @@
 #else
   dvgrabw->grab = gtk_button_new_from_stock (GTK_STOCK_NO);
 #endif
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->grab);
+  lives_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->grab);
   lives_widget_set_can_focus_and_default (dvgrabw->grab);
 
 #if GTK_CHECK_VERSION(2,6,0)
@@ -142,22 +142,22 @@
 #else
   image = lives_image_new_from_stock (GTK_STOCK_NO,LIVES_ICON_SIZE_BUTTON);
 #endif
-  gtk_button_set_label(GTK_BUTTON(dvgrabw->grab),_("_Grab"));
+  lives_button_set_label(GTK_BUTTON(dvgrabw->grab),_("_Grab"));
   gtk_button_set_image(GTK_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"));
-  gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,widget_opts.packing_height*4);
+  lives_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,widget_opts.packing_height*4);
 
 
   hbuttonbox2 = lives_hbutton_box_new ();
-  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox2,FALSE,FALSE,widget_opts.packing_height);
+  lives_box_pack_start(GTK_BOX(vbox),hbuttonbox2,FALSE,FALSE,widget_opts.packing_height);
 
   dvgrabw->quit = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox2), dvgrabw->quit);
+  lives_container_add (GTK_CONTAINER (hbuttonbox2), dvgrabw->quit);
   lives_widget_set_can_focus_and_default (dvgrabw->quit);
 
   image=lives_image_new_from_stock(GTK_STOCK_CLOSE,LIVES_ICON_SIZE_BUTTON);
-  gtk_button_set_label(GTK_BUTTON(dvgrabw->quit),_("_Close Window"));
+  lives_button_set_label(GTK_BUTTON(dvgrabw->quit),_("_Close Window"));
   gtk_button_set_image(GTK_BUTTON(dvgrabw->quit),image);
 
   //////////////////////////////////////////////////////////////////////////////////////////
@@ -170,7 +170,7 @@
   g_signal_connect (dvgrabw->quit, "clicked",G_CALLBACK (on_camquit_clicked),(gpointer)cam);
 
 
-  gtk_widget_show_all(dvgrabw->dialog);
+  lives_widget_show_all(dvgrabw->dialog);
   
   dvgrabw->dirname=NULL;

LiVES-2.0.3.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.0.4.tar.bz2/src/lives-yuv4mpeg.c Changed

@@ -581,9 +581,9 @@
   tvcardw=(lives_tvcardw_t *)g_object_get_data(G_OBJECT(card_dialog),"tvcard_data");
 
 
-  response=gtk_dialog_run(GTK_DIALOG(card_dialog));
+  response=lives_dialog_run(GTK_DIALOG(card_dialog));
   if (response==GTK_RESPONSE_CANCEL) {
-    gtk_widget_destroy(card_dialog);
+    lives_widget_destroy(card_dialog);
     g_free(fifofile);
     g_free(tvcardw);
     return;
@@ -593,7 +593,7 @@
   chanstr=g_strdup_printf("%d",(gint)mainw->fx2_val);
 
   if (g_list_find(mainw->videodevs,GINT_TO_POINTER(cardno))) {
-    gtk_widget_destroy(card_dialog);
+    lives_widget_destroy(card_dialog);
     do_card_in_use_error();
     g_free(chanstr);
     g_free(fifofile);
@@ -604,7 +604,7 @@
   fname=g_strdup_printf(_("TV card %d"),cardno);
 
   if (!get_new_handle(new_file,fname)) {
-    gtk_widget_destroy(card_dialog);
+    lives_widget_destroy(card_dialog);
     g_free(chanstr);
     g_free(fifofile);
     g_free(fname);
@@ -615,7 +615,7 @@
   devstr=g_strdup_printf("/dev/video%d",cardno);
 
   if (!check_dev_busy(devstr)) {
-    gtk_widget_destroy(card_dialog);
+    lives_widget_destroy(card_dialog);
     do_dev_busy_error(fname);
     g_free(devstr);
     g_free(chanstr);
@@ -642,12 +642,12 @@
     gdouble fps=0.;
     gchar *driver=NULL,*outfmt=NULL;
     gint width=0,height=0;
-    gint input=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttoni));
+    gint input=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttoni));
     
     if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(tvcardw->radiobuttond))) {
-      width=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonw));
-      height=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonh));
-      fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(tvcardw->spinbuttonf));
+      width=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonw));
+      height=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonh));
+      fps=lives_spin_button_get_value(GTK_SPIN_BUTTON(tvcardw->spinbuttonf));
     }
 
     driver=lives_combo_get_active_text(LIVES_COMBO(tvcardw->combod));
@@ -660,7 +660,7 @@
     g_free(outfmt);
 
   }
-  gtk_widget_destroy(card_dialog);
+  lives_widget_destroy(card_dialog);
   g_free(tvcardw);
 
   mainw->com_failed=FALSE;
@@ -719,16 +719,16 @@
   mainw->open_deint=FALSE;
 
   card_dialog=create_cdtrack_dialog(5,NULL);
-  response=gtk_dialog_run(GTK_DIALOG(card_dialog));
+  response=lives_dialog_run(GTK_DIALOG(card_dialog));
   if (response==GTK_RESPONSE_CANCEL) {
-    gtk_widget_destroy(card_dialog);
+    lives_widget_destroy(card_dialog);
     g_free(fifofile);
     return;
   }
 
   cardno=(gint)mainw->fx1_val;
 
-  gtk_widget_destroy(card_dialog);
+  lives_widget_destroy(card_dialog);
 
   if (g_list_find(fw_cards,GINT_TO_POINTER(cardno))) {
     g_free(fifofile);

LiVES-2.0.3.tar.bz2/src/main.c -> LiVES-2.0.4.tar.bz2/src/main.c Changed

@@ -619,8 +619,8 @@
 
     if (mainw->resize_menuitem==NULL) {
       rfx->menu_text=g_strdup(_("_Resize All Frames"));
-      mainw->resize_menuitem = gtk_menu_item_new_with_mnemonic(rfx->menu_text);
-      gtk_widget_show(mainw->resize_menuitem);
+      mainw->resize_menuitem = lives_menu_item_new_with_mnemonic(rfx->menu_text);
+      lives_widget_show(mainw->resize_menuitem);
       gtk_menu_shell_insert (GTK_MENU_SHELL (mainw->tools_menu), mainw->resize_menuitem, RFX_TOOL_MENU_POSN);
     }
     else {
@@ -1024,6 +1024,7 @@
 
   mainw->signal_caught=0;
   mainw->signals_deferred=FALSE;
+
   /////////////////////////////////////////////////// add new stuff just above here ^^
 
 
@@ -1069,11 +1070,11 @@
       gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
 						      lives_widget_get_allocation_height(mainw->LiVES))/2;
       gtk_window_set_screen(GTK_WINDOW(mainw->LiVES),mainw->mgeom[prefs->gui_monitor-1].screen);
-      gtk_window_move(GTK_WINDOW(mainw->LiVES),xcen,ycen);
+      lives_window_move(GTK_WINDOW(mainw->LiVES),xcen,ycen);
 
     }
     if (prefs->open_maximised&&prefs->show_gui) {
-      gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
+      lives_window_maximize (GTK_WINDOW(mainw->LiVES));
     }
 
     prefs->default_fps=get_double_pref("default_fps");
@@ -2288,7 +2289,7 @@
 
   if (gerr!=NULL) g_error_free(gerr);
 
-  gtk_widget_queue_draw(mainw->LiVES);
+  lives_widget_queue_draw(mainw->LiVES);
   lives_widget_context_update();
 
   mainw->startup_error=FALSE;
@@ -2420,7 +2421,7 @@
 
 		  if (prefs->startup_interface!=STARTUP_MT) {
 		    if (prefs->show_gui) {
-		      gtk_widget_show (mainw->LiVES);
+		      lives_widget_show (mainw->LiVES);
 		    }
 #ifdef ENABLE_OSC
 		    lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_CE)));
@@ -2467,7 +2468,7 @@
       pulse_audio_read_init();
     }
 #endif
-    gtk_widget_show (mainw->LiVES);
+    lives_widget_show (mainw->LiVES);
     on_capture2_activate();  // exits
   }
 
@@ -2486,7 +2487,7 @@
     mainw->cached_list=NULL;
   }
 
-  if (!prefs->show_gui) gtk_widget_hide(mainw->LiVES);
+  if (!prefs->show_gui) lives_widget_hide(mainw->LiVES);
 
   if (prefs->startup_phase==100) {
 #ifndef IS_MINGW
@@ -2997,9 +2998,9 @@
     title=g_strdup_printf(_ ("LiVES-%s: <No File>"),LiVES_VERSION);
   }
 
-  gtk_window_set_title (GTK_WINDOW (mainw->LiVES), title);
+  lives_window_set_title (GTK_WINDOW (mainw->LiVES), title);
 
-  if (mainw->playing_file==-1&&mainw->play_window!=NULL) gtk_window_set_title(GTK_WINDOW(mainw->play_window),title);
+  if (mainw->playing_file==-1&&mainw->play_window!=NULL) lives_window_set_title(GTK_WINDOW(mainw->play_window),title);
 
   g_free(title);
 }
@@ -3012,145 +3013,145 @@
 
   if (mainw->multitrack!=NULL) return;
 
-  gtk_widget_set_sensitive (mainw->open, TRUE);
-  gtk_widget_set_sensitive (mainw->open_sel, TRUE);
-  gtk_widget_set_sensitive (mainw->open_vcd_menu, TRUE);
+  lives_widget_set_sensitive (mainw->open, TRUE);
+  lives_widget_set_sensitive (mainw->open_sel, TRUE);
+  lives_widget_set_sensitive (mainw->open_vcd_menu, TRUE);
 #ifdef HAVE_WEBM
-  gtk_widget_set_sensitive (mainw->open_loc_menu, TRUE);
+  lives_widget_set_sensitive (mainw->open_loc_menu, TRUE);
 #else
-  gtk_widget_set_sensitive (mainw->open_loc, TRUE);
+  lives_widget_set_sensitive (mainw->open_loc, TRUE);
 #endif
-  gtk_widget_set_sensitive (mainw->open_device_menu, TRUE);
-  gtk_widget_set_sensitive (mainw->restore, TRUE);
-  gtk_widget_set_sensitive (mainw->recent_menu, TRUE);
-  gtk_widget_set_sensitive (mainw->save_as, mainw->current_file>0&&capable->has_encoder_plugins);
-  gtk_widget_set_sensitive (mainw->backup, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->save_selection, mainw->current_file>0&&cfile->frames>0&&capable->has_encoder_plugins);
-  gtk_widget_set_sensitive (mainw->clear_ds, TRUE);
-  gtk_widget_set_sensitive (mainw->playsel, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->copy, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->cut, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->rev_clipboard, !(clipboard==NULL));
-  gtk_widget_set_sensitive (mainw->playclip, !(clipboard==NULL));
-  gtk_widget_set_sensitive (mainw->paste_as_new, !(clipboard==NULL));
-  gtk_widget_set_sensitive (mainw->insert, !(clipboard==NULL));
-  gtk_widget_set_sensitive (mainw->merge,(clipboard!=NULL&&cfile->frames>0));
-  gtk_widget_set_sensitive (mainw->xdelete, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->playall, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->m_playbutton, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->m_playselbutton, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->m_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
-  gtk_widget_set_sensitive (mainw->m_loopbutton, TRUE);
-  gtk_widget_set_sensitive (mainw->m_mutebutton, TRUE);
+  lives_widget_set_sensitive (mainw->open_device_menu, TRUE);
+  lives_widget_set_sensitive (mainw->restore, TRUE);
+  lives_widget_set_sensitive (mainw->recent_menu, TRUE);
+  lives_widget_set_sensitive (mainw->save_as, mainw->current_file>0&&capable->has_encoder_plugins);
+  lives_widget_set_sensitive (mainw->backup, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->save_selection, mainw->current_file>0&&cfile->frames>0&&capable->has_encoder_plugins);
+  lives_widget_set_sensitive (mainw->clear_ds, TRUE);
+  lives_widget_set_sensitive (mainw->playsel, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive (mainw->copy, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive (mainw->cut, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive (mainw->rev_clipboard, !(clipboard==NULL));
+  lives_widget_set_sensitive (mainw->playclip, !(clipboard==NULL));
+  lives_widget_set_sensitive (mainw->paste_as_new, !(clipboard==NULL));
+  lives_widget_set_sensitive (mainw->insert, !(clipboard==NULL));
+  lives_widget_set_sensitive (mainw->merge,(clipboard!=NULL&&cfile->frames>0));
+  lives_widget_set_sensitive (mainw->xdelete, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive (mainw->playall, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->m_playbutton, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->m_playselbutton, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive (mainw->m_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
+  lives_widget_set_sensitive (mainw->m_loopbutton, TRUE);
+  lives_widget_set_sensitive (mainw->m_mutebutton, TRUE);
   if (mainw->preview_box!=NULL) {
-    gtk_widget_set_sensitive (mainw->p_playbutton, mainw->current_file>0);
-    gtk_widget_set_sensitive (mainw->p_playselbutton, mainw->current_file>0&&cfile->frames>0);
-    gtk_widget_set_sensitive (mainw->p_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
-    gtk_widget_set_sensitive (mainw->p_loopbutton, TRUE);
-    gtk_widget_set_sensitive (mainw->p_mutebutton, TRUE);
+    lives_widget_set_sensitive (mainw->p_playbutton, mainw->current_file>0);
+    lives_widget_set_sensitive (mainw->p_playselbutton, mainw->current_file>0&&cfile->frames>0);
+    lives_widget_set_sensitive (mainw->p_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
+    lives_widget_set_sensitive (mainw->p_loopbutton, TRUE);
+    lives_widget_set_sensitive (mainw->p_mutebutton, TRUE);
   }
 
-  gtk_widget_set_sensitive (mainw->rewind, mainw->current_file>0&&cfile->pointer_time>0.);
-  gtk_widget_set_sensitive (mainw->show_file_info, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->show_file_comments, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->full_screen, TRUE);
-  gtk_widget_set_sensitive (mainw->mt_menu, TRUE);
-  gtk_widget_set_sensitive (mainw->add_live_menu,TRUE);
-  gtk_widget_set_sensitive (mainw->export_proj, mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->import_proj, mainw->current_file==-1);
+  lives_widget_set_sensitive (mainw->rewind, mainw->current_file>0&&cfile->pointer_time>0.);
+  lives_widget_set_sensitive (mainw->show_file_info, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->show_file_comments, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->full_screen, TRUE);
+  lives_widget_set_sensitive (mainw->mt_menu, TRUE);
+  lives_widget_set_sensitive (mainw->add_live_menu,TRUE);
+  lives_widget_set_sensitive (mainw->export_proj, mainw->current_file>0);
+  lives_widget_set_sensitive (mainw->import_proj, mainw->current_file==-1);
   
   if (!mainw->foreign) {
     for (i=1;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
 	   mainw->num_rendered_effects_test;i++) 
       if (mainw->rendered_fx[i].menuitem!=NULL&&mainw->rendered_fx[i].min_frames>=0) 
-	gtk_widget_set_sensitive(mainw->rendered_fx[i].menuitem,mainw->current_file>0&&cfile->frames>0);
+	lives_widget_set_sensitive(mainw->rendered_fx[i].menuitem,mainw->current_file>0&&cfile->frames>0);
 
     if (mainw->current_file>0&&((has_video_filters(FALSE)&&!has_video_filters(TRUE))||
 				(cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||
 				mainw->agen_key!=0)) {
       
-      gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
+      lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
     }
-    else gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+    else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
   }
   
-  gtk_widget_set_sensitive (mainw->record_perf, TRUE);
-  gtk_widget_set_sensitive (mainw->export_submenu, mainw->current_file>0&&(cfile->achans>0));
-  gtk_widget_set_sensitive (mainw->recaudio_submenu, TRUE);
-  gtk_widget_set_sensitive (mainw->recaudio_sel, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->append_audio, mainw->current_file>0&&cfile->achans>0);
-  gtk_widget_set_sensitive (mainw->trim_submenu, mainw->current_file>0&&cfile->achans>0);
-  gtk_widget_set_sensitive (mainw->fade_aud_in, mainw->current_file>0&&cfile->achans>0);
-  gtk_widget_set_sensitive (mainw->fade_aud_out, mainw->current_file>0&&cfile->achans>0);
-  gtk_widget_set_sensitive (mainw->trim_audio, mainw->current_file>0&&(cfile->achans*cfile->frames>0));
-  gtk_widget_set_sensitive (mainw->trim_to_pstart, mainw->current_file>0&&(cfile->achans&&cfile->pointer_time>0.));

LiVES-2.0.3.tar.bz2/src/merge.c -> LiVES-2.0.4.tar.bz2/src/merge.c Changed

@@ -84,7 +84,7 @@
 
   merge_opts->merge_dialog = lives_standard_dialog_new (_("LiVES: - Merge"),FALSE);
 
-  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (merge_opts->merge_dialog), accel_group);
 
   if (prefs->show_gui) {
@@ -94,10 +94,10 @@
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(merge_opts->merge_dialog));
 
   vbox = lives_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   txt=g_strdup_printf(_ ("Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"),clipboard->frames,cfile->end-cfile->start+1);
   if (prefs->ins_resample&&clipboard->fps!=cfile->fps) {
@@ -111,7 +111,7 @@
   label = lives_standard_label_new (txt);
   g_free(txt);
 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
@@ -127,12 +127,12 @@
 
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height*2);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height*2);
 
   if ((cfile->end-cfile->start+1)<cb_frames) {
     // hide loop controls if selection is smaller than clipboard
     label = lives_standard_label_new (_("What to do with extra clipboard frames -"));
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    lives_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
     merge_opts->ins_frame_button=lives_standard_radio_button_new(_("_Insert Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL);
     radiobutton_insdrop_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (merge_opts->ins_frame_button));
@@ -150,8 +150,8 @@
        (int)((cfile->end-cfile->start+1)/cb_frames), 1., 10., 0, LIVES_BOX(hbox), NULL);
     
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops);
-    gtk_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit);
+    lives_spin_button_set_value (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops);
+    lives_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit);
 
     g_signal_connect_after (GTK_OBJECT (merge_opts->spinbutton_loops), "value_changed",
 			    G_CALLBACK (after_spinbutton_loops_changed),
@@ -168,11 +168,11 @@
   add_hsep_to_box(LIVES_BOX(vbox));
   
   hbox = lives_hbox_new (TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   transition_combo = lives_standard_combo_new (_("_Transition Method:"),TRUE,merge_opts->trans_list,LIVES_BOX(hbox),NULL);
 
-  gtk_combo_box_set_active(GTK_COMBO_BOX(transition_combo),defstart);
+  lives_combo_set_active_index(GTK_COMBO_BOX(transition_combo),defstart);
 
   mainw->last_transition_idx=merge_opts->list_to_rfx_index[defstart];
 
@@ -181,15 +181,15 @@
 
   // now the dynamic part...
   merge_opts->param_vbox = lives_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER(merge_opts->param_vbox), widget_opts.border_width>>1);
+  lives_container_set_border_width (GTK_CONTAINER(merge_opts->param_vbox), widget_opts.border_width>>1);
 
-  gtk_box_pack_start (GTK_BOX (vbox), merge_opts->param_vbox, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), merge_opts->param_vbox, TRUE, TRUE, 0);
 
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
   mainw->overflow_height=900;
   make_param_box(GTK_VBOX (merge_opts->param_vbox), rfx);
   mainw->overflow_height=0;
-  gtk_widget_show_all (merge_opts->param_vbox);
+  lives_widget_show_all (merge_opts->param_vbox);
 
   retvals=do_onchange_init(rfx);
 
@@ -207,11 +207,11 @@
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
   lives_widget_set_can_focus (cancelbutton,TRUE);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), okbutton, GTK_RESPONSE_OK);
+  lives_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), okbutton, GTK_RESPONSE_OK);
   lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
 
@@ -220,7 +220,7 @@
                       rfx);
 
 
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+  lives_widget_add_accelerator (cancelbutton, "activate", accel_group,
                               LIVES_KEY_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
 
 
@@ -237,12 +237,12 @@
 
 
   if (prefs->show_gui) {
-    gtk_widget_show_all(merge_opts->merge_dialog);
+    lives_widget_show_all(merge_opts->merge_dialog);
   }
 }
 
 static void bang (GtkWidget *widget, gpointer null) {
-  gtk_widget_destroy (widget);
+  lives_widget_destroy (widget);
 }
 
 
@@ -273,7 +273,7 @@
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
 
   make_param_box(GTK_VBOX (merge_opts->param_vbox), rfx);
-  gtk_widget_show_all (merge_opts->param_vbox);
+  lives_widget_show_all (merge_opts->param_vbox);
 
   retvals=do_onchange_init(rfx);
 
@@ -313,8 +313,8 @@
   lives_rfx_t *rfx=(lives_rfx_t *)user_data;
   on_paramwindow_cancel_clicked (NULL,rfx);
   if (merge_opts->spinbutton_loops!=NULL) 
-    mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
-  gtk_widget_destroy(merge_opts->merge_dialog);
+    mainw->last_transition_loops=lives_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
+  lives_widget_destroy(merge_opts->merge_dialog);
   lives_widget_context_update();
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
@@ -350,7 +350,7 @@
   lives_rfx_t *rfx;
 
   if (merge_opts->spinbutton_loops!=NULL) 
-    mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
+    mainw->last_transition_loops=lives_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
 
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
@@ -361,7 +361,7 @@
   if (cfile->fps!=clipboard->fps) {
     if (!do_clipboard_fps_warning()) {
       on_paramwindow_cancel_clicked (NULL,rfx);
-      gtk_widget_destroy(merge_opts->merge_dialog);
+      lives_widget_destroy(merge_opts->merge_dialog);
       lives_widget_context_update();
       g_list_free (merge_opts->trans_list);
       g_free (merge_opts->list_to_rfx_index);
@@ -371,12 +371,12 @@
   }
 
   if (merge_opts->spinbutton_loops!=NULL) 
-    times_to_loop=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(merge_opts->spinbutton_loops));
+    times_to_loop=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(merge_opts->spinbutton_loops));
   else 
     times_to_loop=1;
 
   on_paramwindow_cancel_clicked (NULL,rfx);
-  gtk_widget_destroy(merge_opts->merge_dialog);
+  lives_widget_destroy(merge_opts->merge_dialog);
   lives_widget_context_update();
   g_list_free (merge_opts->trans_list);
   g_free (merge_opts->list_to_rfx_index);
@@ -402,7 +402,7 @@
   cfile->insert_end=0;
 
   cfile->redoable=FALSE;
-  gtk_widget_set_sensitive(mainw->redo,FALSE);
+  lives_widget_set_sensitive(mainw->redo,FALSE);
 
   mainw->fx2_bool=FALSE;
 
@@ -595,7 +595,7 @@
 on_fit_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
 
   merge_opts->loop_to_fit=!merge_opts->loop_to_fit;
-  gtk_widget_set_sensitive(merge_opts->spinbutton_loops,!merge_opts->loop_to_fit);
+  lives_widget_set_sensitive(merge_opts->spinbutton_loops,!merge_opts->loop_to_fit);
   setmergealign();
 }

LiVES-2.0.3.tar.bz2/src/multitrack.c -> LiVES-2.0.4.tar.bz2/src/multitrack.c Changed

@@ -1086,7 +1086,7 @@
   if (!G_IS_OBJECT(eventbox)) return;
 
   g_object_set_data(G_OBJECT(eventbox),"drawn",GINT_TO_POINTER(FALSE));
-  gtk_widget_queue_draw (eventbox); // redraw the track
+  lives_widget_queue_draw (eventbox); // redraw the track
 
   if (is_audio_eventbox(mt,eventbox)) {
     // handle expanded audio
@@ -1094,11 +1094,11 @@
     if (cfile->achans>0) {
       xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
       g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
-      gtk_widget_queue_draw (xeventbox); // redraw the track
+      lives_widget_queue_draw (xeventbox); // redraw the track
       if (cfile->achans>1) {
 	xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
 	g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
-	gtk_widget_queue_draw (xeventbox); // redraw the track
+	lives_widget_queue_draw (xeventbox); // redraw the track
       }
     }
   }
@@ -1155,8 +1155,8 @@
   hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
   if (hidden!=0) {
     GtkWidget *label=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
-    gtk_widget_hide(eventbox);
-    gtk_widget_hide(lives_widget_get_parent(label));
+    lives_widget_hide(eventbox);
+    lives_widget_hide(lives_widget_get_parent(label));
     return FALSE;
   }
 
@@ -1268,7 +1268,7 @@
 }
 
 double mt_get_effect_time(lives_mt *mt) {
-  return q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC,mt->fps)/U_SEC;
+  return q_gint64(lives_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC,mt->fps)/U_SEC;
 }
 
 
@@ -1303,11 +1303,11 @@
   fx_end_time=get_event_timecode(deinit_event)/U_SEC;
 
   if (mt->fx_box!=NULL) {
-    gtk_widget_destroy(mt->fx_box);
+    lives_widget_destroy(mt->fx_box);
   }
 
   mt->fx_box=lives_vbox_new(FALSE,0);
-  gtk_box_pack_end(GTK_BOX(mt->fx_base_box),mt->fx_box,TRUE,TRUE,0);
+  lives_box_pack_end(GTK_BOX(mt->fx_base_box),mt->fx_box,TRUE,TRUE,0);
 
   ltext=mt_params_label(mt);
 
@@ -1322,14 +1322,14 @@
   widget_opts.packing_height=dph;
   widget_opts.border_width=dbw;
 
-  gtk_label_set_text(GTK_LABEL(mt->fx_params_label),ltext);
+  lives_label_set_text(GTK_LABEL(mt->fx_params_label),ltext);
 
   g_free(ltext);
 
-  gtk_widget_show_all(mt->fx_base_box);
+  lives_widget_show_all(mt->fx_base_box);
 
-  if (res) gtk_widget_show(mt->fx_contents_box);
-  else gtk_widget_hide(mt->fx_contents_box);
+  if (res) lives_widget_show(mt->fx_contents_box);
+  else lives_widget_hide(mt->fx_contents_box);
 
   mt->prev_fx_time=mt_get_effect_time(mt);
   return res;
@@ -1461,28 +1461,28 @@
   if (mt->current_track<0) {
     // back aud sel
     
-    gtk_widget_set_sensitive(mt->select_track,FALSE);
-    gtk_widget_set_sensitive(mt->rename_track,FALSE);
-    gtk_widget_set_sensitive(mt->insert, FALSE);
+    lives_widget_set_sensitive(mt->select_track,FALSE);
+    lives_widget_set_sensitive(mt->rename_track,FALSE);
+    lives_widget_set_sensitive(mt->insert, FALSE);
 
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+    lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
 
 
-    gtk_widget_set_sensitive(mt->cback_audio,FALSE);
-    gtk_widget_set_sensitive (mt->audio_insert, mt->file_selected>0&&
+    lives_widget_set_sensitive(mt->cback_audio,FALSE);
+    lives_widget_set_sensitive (mt->audio_insert, mt->file_selected>0&&
 			      mainw->files[mt->file_selected]->achans>0&&
 			      mainw->files[mt->file_selected]->laudio_time>0.);
 
   }
   else {
     // vid sel
-    gtk_widget_set_sensitive(mt->select_track,TRUE);
-    gtk_widget_set_sensitive(mt->rename_track,TRUE);
-    gtk_widget_set_sensitive(mt->cback_audio,TRUE);
-
-    gtk_widget_set_sensitive(mt->insert, mt->file_selected>0&&mainw->files[mt->file_selected]->frames>0);
-    gtk_widget_set_sensitive(mt->adjust_start_end, mt->file_selected>0);
-    gtk_widget_set_sensitive(mt->audio_insert, FALSE);
+    lives_widget_set_sensitive(mt->select_track,TRUE);
+    lives_widget_set_sensitive(mt->rename_track,TRUE);
+    lives_widget_set_sensitive(mt->cback_audio,TRUE);
+
+    lives_widget_set_sensitive(mt->insert, mt->file_selected>0&&mainw->files[mt->file_selected]->frames>0);
+    lives_widget_set_sensitive(mt->adjust_start_end, mt->file_selected>0);
+    lives_widget_set_sensitive(mt->audio_insert, FALSE);
   }
 
   if (cfile->achans>0) {
@@ -1499,8 +1499,8 @@
 
 	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
 	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
-	  gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+	  lives_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+	  lives_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
 
 	}
 	else {
@@ -1526,12 +1526,12 @@
 	  if (checkbutton!=NULL) {
 	    // gtk 3+ idiocy...
 	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_queue_draw(checkbutton);
 	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
-	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_queue_draw(checkbutton);
 	  }
-	  gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+	  lives_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+	  lives_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
 	}
 	else {
 	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
@@ -1539,9 +1539,9 @@
 	  if (checkbutton!=NULL) {
 	    // gtk 3+ idiocy...
 	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
-	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_queue_draw(checkbutton);
 	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_queue_draw(checkbutton);
 	  }
 	}
 
@@ -1557,13 +1557,13 @@
 	  {
 	    // set other widgets
 	    if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) {
- 	      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+ 	      lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
 	    }
 	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
 	}
 	else {
 	  if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
-	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),TRUE);
+	    lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),TRUE);
 	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
 	}
     }
@@ -1572,7 +1572,7 @@
 	if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
 	if (checkbutton!=NULL) {
 	  lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	  gtk_widget_queue_draw(checkbutton);
+	  lives_widget_queue_draw(checkbutton);
 	}
       }
     }
@@ -1583,7 +1583,7 @@
       weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     boolean xx;
     weed_timecode_t init_tc=get_event_timecode(mt->init_event);
-    tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
+    tc=q_gint64(lives_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
 
     // must be done in this order: interpolate, update, preview
     xx=get_track_index(mt,tc);
@@ -1605,7 +1605,7 @@
       }
       if (mt->fx_params_label!=NULL) {
 	gchar *ltext=mt_params_label(mt);
-	gtk_label_set_text(GTK_LABEL(mt->fx_params_label),ltext);
+	lives_label_set_text(GTK_LABEL(mt->fx_params_label),ltext);
 	g_free(ltext);
       }

LiVES-2.0.3.tar.bz2/src/omc-learn.c -> LiVES-2.0.4.tar.bz2/src/omc-learn.c Changed

@@ -112,8 +112,8 @@
     slist=slist_next;
   }
 
-  gtk_widget_set_sensitive(omclw->clear_button,FALSE);
-  if (slist==NULL) gtk_widget_set_sensitive(omclw->del_all_button,FALSE);
+  lives_widget_set_sensitive(omclw->clear_button,FALSE);
+  if (slist==NULL) lives_widget_set_sensitive(omclw->del_all_button,FALSE);
 
 }
 
@@ -741,9 +741,9 @@
 
 
 
-  gtk_widget_show (mnode->treev2);
+  lives_widget_show (mnode->treev2);
   
-  gtk_table_attach (GTK_TABLE (omclw->table), mnode->treev2, 3, 4, row, row+1,
+  lives_table_attach (GTK_TABLE (omclw->table), mnode->treev2, 3, 4, row, row+1,
 		    (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
 		    (GtkAttachOptions) (0), 0, 0);
   
@@ -813,7 +813,7 @@
 
   if (mnode->treev2!=NULL) {
     // remove old mapping
-    gtk_widget_destroy(mnode->treev2);
+    lives_widget_destroy(mnode->treev2);
     mnode->treev2=NULL;
     
     mnode->macro=-1;
@@ -959,7 +959,7 @@
   }
 
   if (mnode->macro!=-1) {
-    gtk_combo_box_set_active (GTK_COMBO_BOX(combo),mnode->macro);
+    lives_combo_set_active_index (GTK_COMBO_BOX(combo),mnode->macro);
   }
 
   g_signal_connect_after (G_OBJECT (combo), "changed", G_CALLBACK (on_omc_combo_entry_changed), mnode);
@@ -1076,12 +1076,12 @@
    }
 
    label = lives_standard_label_new (labelt);
-   gtk_widget_show (label);
+   lives_widget_show (label);
    
    if (labelt!=NULL) g_free(labelt);
      
    omclw->tbl_currow++;
-   gtk_table_attach (GTK_TABLE (omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1,
+   lives_table_attach (GTK_TABLE (omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1,
 		     (GtkAttachOptions) (0),
 		     (GtkAttachOptions) (0), 0, 0);
 
@@ -1177,23 +1177,23 @@
 						      NULL);
    gtk_tree_view_append_column (GTK_TREE_VIEW (mnode->treev1), column);
 
-   gtk_widget_show (mnode->treev1);
+   lives_widget_show (mnode->treev1);
   
-   gtk_table_attach (GTK_TABLE (omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1,
+   lives_table_attach (GTK_TABLE (omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1,
 		     (GtkAttachOptions) (0),
 		     (GtkAttachOptions) (0), 0, 0);
 
    combo=create_omc_macro_combo(mnode,omclw->tbl_currow,omclw);
 
-   gtk_widget_show (combo);
+   lives_widget_show (combo);
   
-   gtk_table_attach (GTK_TABLE (omclw->table), combo, 2, 3, omclw->tbl_currow, omclw->tbl_currow+1,
+   lives_table_attach (GTK_TABLE (omclw->table), combo, 2, 3, omclw->tbl_currow, omclw->tbl_currow+1,
 		     (GtkAttachOptions) 0,
 		     (GtkAttachOptions) (0), 0, 0);
 
 
-  if (mnode->macro==-1) gtk_widget_set_sensitive(omclw->clear_button,TRUE);
-  gtk_widget_set_sensitive(omclw->del_all_button,TRUE);
+  if (mnode->macro==-1) lives_widget_set_sensitive(omclw->clear_button,TRUE);
+  lives_widget_set_sensitive(omclw->del_all_button,TRUE);
 
 }
    
@@ -1202,7 +1202,7 @@
 
 
 static void killit(GtkWidget *widget, gpointer user_data) {
-  gtk_widget_destroy(widget);
+  lives_widget_destroy(widget);
 }
 
 
@@ -1320,38 +1320,38 @@
 
   scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, omclw->table);
 
-  gtk_box_pack_start (GTK_BOX (omclw->top_vbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (omclw->top_vbox), scrolledwindow, TRUE, TRUE, 0);
 
 
 
   hbuttonbox = lives_dialog_get_action_area(LIVES_DIALOG(omclw->dialog));
   
-  omclw->clear_button = gtk_button_new_with_mnemonic (_("Clear _unmatched"));
+  omclw->clear_button = lives_button_new_with_mnemonic (_("Clear _unmatched"));
 
-  gtk_container_add (GTK_CONTAINER (hbuttonbox), omclw->clear_button);
+  lives_container_add (GTK_CONTAINER (hbuttonbox), omclw->clear_button);
   
 
   g_signal_connect (GTK_OBJECT (omclw->clear_button), "clicked",
 		    G_CALLBACK (clear_unmatched),
 		    (gpointer)omclw);
 
-  gtk_widget_set_sensitive(omclw->clear_button,FALSE);
+  lives_widget_set_sensitive(omclw->clear_button,FALSE);
 
-  omclw->del_all_button = gtk_button_new_with_mnemonic (_("_Delete all"));
+  omclw->del_all_button = lives_button_new_with_mnemonic (_("_Delete all"));
 
-  gtk_container_add (GTK_CONTAINER (hbuttonbox), omclw->del_all_button);
+  lives_container_add (GTK_CONTAINER (hbuttonbox), omclw->del_all_button);
   
 
   g_signal_connect (GTK_OBJECT (omclw->del_all_button), "clicked",
 		    G_CALLBACK (del_all),
 		    (gpointer)omclw);
 
-  gtk_widget_set_sensitive(omclw->del_all_button,FALSE);
+  lives_widget_set_sensitive(omclw->del_all_button,FALSE);
 
 
-  ok_button = gtk_button_new_with_mnemonic (_("Close _window"));
+  ok_button = lives_button_new_with_mnemonic (_("Close _window"));
 
-  gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
+  lives_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
   
   lives_widget_set_can_focus_and_default (ok_button);
 
@@ -1360,9 +1360,9 @@
 #if !GTK_CHECK_VERSION(3,0,0)
   gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
 #else
-  gtk_widget_set_size_request(ok_button,DEF_BUTTON_WIDTH*4,-1);
-  gtk_widget_set_size_request(omclw->clear_button,DEF_BUTTON_WIDTH*4,-1);
-  gtk_widget_set_size_request(omclw->del_all_button,DEF_BUTTON_WIDTH*4,-1);
+  lives_widget_set_size_request(ok_button,DEF_BUTTON_WIDTH*4,-1);
+  lives_widget_set_size_request(omclw->clear_button,DEF_BUTTON_WIDTH*4,-1);
+  lives_widget_set_size_request(omclw->del_all_button,DEF_BUTTON_WIDTH*4,-1);
 #endif
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
   
@@ -1377,15 +1377,15 @@
     gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height
 						    -lives_widget_get_allocation_height(omclw->dialog))/2;
     gtk_window_set_screen(GTK_WINDOW(omclw->dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
-    gtk_window_move(GTK_WINDOW(omclw->dialog),xcen,ycen);
+    lives_window_move(GTK_WINDOW(omclw->dialog),xcen,ycen);
   }
   
   if (prefs->open_maximised) {
-    gtk_window_maximize (GTK_WINDOW(omclw->dialog));
+    lives_window_maximize (GTK_WINDOW(omclw->dialog));
   }
 
   if (prefs->show_gui)
-    gtk_widget_show_all(omclw->dialog);
+    lives_widget_show_all(omclw->dialog);
   
   return omclw;
 }
@@ -2112,7 +2112,7 @@
   if (!mainw->ext_cntl[EXT_CNTL_JS]) js_open();
 #endif
 
-  gtk_widget_show(omclw->dialog);
+  lives_widget_show(omclw->dialog);
 
   mainw->cancelled=CANCEL_NONE;
 
@@ -2156,7 +2156,7 @@
 
   remove_all_nodes(FALSE,omclw);
 
-  gtk_widget_destroy(omclw->dialog);
+  lives_widget_destroy(omclw->dialog);
 
   mainw->cancelled=CANCEL_NONE;

LiVES-2.0.3.tar.bz2/src/osc.c -> LiVES-2.0.4.tar.bz2/src/osc.c Changed

@@ -766,7 +766,7 @@
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
-  if (mainw->playing_file>-1) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),(gdouble)(fps));
+  if (mainw->playing_file>-1) lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),(gdouble)(fps));
   lives_osc_notify_success(NULL);
 
 }
@@ -809,7 +809,7 @@
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
-  if (mainw->playing_file>-1) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),(gdouble)(fps)*mainw->files[mainw->playing_file]->fps);
+  if (mainw->playing_file>-1) lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),(gdouble)(fps)*mainw->files[mainw->playing_file]->fps);
   lives_osc_notify_success(NULL);
 
 }
@@ -2157,7 +2157,7 @@
 
   if (frame>sfile->frames) frame=sfile->frames;
 
-  if (clip==mainw->current_file) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),frame);
+  if (clip==mainw->current_file) lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),frame);
   else sfile->start=frame;
 
   if (prefs->omc_noisy) {
@@ -2221,7 +2221,7 @@
 
   if (frame>sfile->frames) frame=sfile->frames;
 
-  if (clip==mainw->current_file) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),frame);
+  if (clip==mainw->current_file) lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),frame);
   else sfile->end=frame;
 
   if (prefs->omc_noisy) {

LiVES-2.0.3.tar.bz2/src/paramspecial.c -> LiVES-2.0.4.tar.bz2/src/paramspecial.c Changed

@@ -164,9 +164,9 @@
   if (rfx->props&RFX_PROPS_MAY_RESIZE) {
     if (framedraw.type!=LIVES_PARAM_SPECIAL_TYPE_NONE) {
       // for effects which can resize, and have a special framedraw, we will use original sized image
-      gtk_widget_hide(mainw->framedraw_preview);
-      gtk_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
-      gtk_widget_set_sensitive(mainw->framedraw_scale,TRUE);
+      lives_widget_hide(mainw->framedraw_preview);
+      lives_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
+      lives_widget_set_sensitive(mainw->framedraw_scale,TRUE);
     }
   }
 }
@@ -199,14 +199,14 @@
     param->special_type=framedraw.type;
     param->special_type_index=0;
     if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
+      lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
     g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
   if (param==framedraw.ystart_param) {
     param->special_type=framedraw.type;
     param->special_type_index=1;
     if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
+      lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
     g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
   if (mainw->current_file>-1) {
@@ -214,14 +214,14 @@
       param->special_type=framedraw.type;
       param->special_type_index=2;
       if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
       g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
     }
     if (param==framedraw.yend_param) {
       param->special_type=framedraw.type;
       param->special_type_index=3;
       if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
       g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
     }
 
@@ -244,19 +244,19 @@
     }
     
     if (param==aspect.width_param) {
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
+      lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
       aspect.width_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
 						G_CALLBACK (after_aspect_width_changed),
 						NULL);
     }
     if (param==aspect.height_param) {
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
+      lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
       aspect.height_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
 						 G_CALLBACK (after_aspect_height_changed),
 						 NULL);
       
       box = lives_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, FALSE, FALSE, widget_opts.packing_height*2);
+      lives_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, FALSE, FALSE, widget_opts.packing_height*2);
       
       
       add_fill_to_box(GTK_BOX(box));
@@ -268,7 +268,7 @@
 
       add_fill_to_box(GTK_BOX(box));
 
-      gtk_widget_show_all(box);
+      lives_widget_show_all(box);
 
       aspect.checkbutton=checkbutton;
     }
@@ -297,11 +297,11 @@
       g_list_free(clist);
 
       buttond = lives_standard_file_button_new (FALSE,g_get_current_dir());
-      gtk_box_pack_start(GTK_BOX(box),buttond,FALSE,FALSE,widget_opts.packing_width);
+      lives_box_pack_start(GTK_BOX(box),buttond,FALSE,FALSE,widget_opts.packing_width);
       gtk_box_reorder_child(GTK_BOX(box),buttond,epos); // insert after label, before textbox
       g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)param->widgets[0]);
 
-      if (!lives_widget_is_sensitive(param->widgets[0])) gtk_widget_set_sensitive(buttond,FALSE);
+      if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(buttond,FALSE);
 
       if (GTK_IS_ENTRY(param->widgets[0])) {
 	lives_entry_set_editable(LIVES_ENTRY(param->widgets[0]),FALSE);
@@ -334,14 +334,14 @@
       }
 
       hbox = lives_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (box)), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start (GTK_BOX (GTK_WIDGET (box)), hbox, FALSE, FALSE, widget_opts.packing_height);
       
       checkbutton = lives_standard_check_button_new (_("Display Password"),FALSE,LIVES_BOX(hbox),NULL);
 
       gtk_button_set_focus_on_click (GTK_BUTTON(checkbutton),FALSE);
 
-      if (!lives_widget_is_sensitive(param->widgets[0])) gtk_widget_set_sensitive(checkbutton,FALSE);
-      gtk_widget_show_all(hbox);
+      if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(checkbutton,FALSE);
+      lives_widget_show_all(hbox);
 
       g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			      G_CALLBACK (passwd_toggle_vis),
@@ -361,8 +361,8 @@
 void after_aspect_width_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
     boolean keepeven=FALSE;
-    gint width=gtk_spin_button_get_value_as_int (spinbutton);
-    gint height=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]));
+    gint width=lives_spin_button_get_value_as_int (spinbutton);
+    gint height=lives_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]));
     g_signal_handler_block (aspect.height_param->widgets[0],aspect.height_func);
 
     if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) {
@@ -381,7 +381,7 @@
       }
     }
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]), (gdouble)height);
+    lives_spin_button_set_value (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]), (gdouble)height);
     g_signal_handler_unblock (aspect.height_param->widgets[0],aspect.height_func);
   }
 }
@@ -390,8 +390,8 @@
 void after_aspect_height_changed (GtkToggleButton *spinbutton, gpointer user_data){
   if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
     boolean keepeven=FALSE;
-    gint height=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinbutton));
-    gint width=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]));
+    gint height=lives_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinbutton));
+    gint width=lives_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]));
 
     g_signal_handler_block (aspect.width_param->widgets[0],aspect.width_func);
 
@@ -412,7 +412,7 @@
       }
     }
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]), (gdouble)width);
+    lives_spin_button_set_value (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]), (gdouble)width);
     g_signal_handler_unblock (aspect.width_param->widgets[0],aspect.width_func);
   }
 }
@@ -457,25 +457,25 @@
   }
 
   if (cfile->end-cfile->start+1>(cb_frames*((merge_opts!=NULL&&merge_opts->spinbutton_loops!=NULL)?
-					    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (merge_opts->spinbutton_loops)):1))
+					    lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON (merge_opts->spinbutton_loops)):1))
       &&!merge_opts->loop_to_fit) {
     // set special transalign widgets to their default values
     if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON
 	(mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
       }
       else {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
       }
     }
     if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
 	(mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
       }
       else {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
       }
     }
   }
@@ -484,22 +484,22 @@
       // set special transalign widgets to min/max values
       if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
 	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min);
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min);
       }
       if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
 	  (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->max);
+	lives_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->max);
       }
     }
     else {
       // set special transalign widgets to max/min values
       if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
 	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->max);

LiVES-2.0.3.tar.bz2/src/paramwindow.c -> LiVES-2.0.4.tar.bz2/src/paramwindow.c Changed

@@ -82,7 +82,7 @@
 	GtkWidget *dummy_widget=gtk_label_new(NULL);
 	g_object_set_data (G_OBJECT (dummy_widget),"param_number",GINT_TO_POINTER (-1));
 	retvals=do_onchange (G_OBJECT (dummy_widget),rfx);
-	gtk_widget_destroy (dummy_widget);
+	lives_widget_destroy (dummy_widget);
 	g_strfreev (array);
 	break;
       }
@@ -156,7 +156,7 @@
   usrgrp_to_livesgrp[0]=NULL;
   if (fx_dialog[1]==NULL) special_cleanup();
   if (mainw->invis!=NULL) {
-    gtk_widget_destroy(mainw->invis);
+    lives_widget_destroy(mainw->invis);
     mainw->invis=NULL;
   }
 
@@ -185,7 +185,7 @@
   on_paramwindow_cancel_clicked(button,rfx);
   fx_dialog[1]=NULL;
   if (mainw->invis!=NULL) {
-    gtk_widget_destroy(mainw->invis);
+    lives_widget_destroy(mainw->invis);
     mainw->invis=NULL;
   }
 }
@@ -313,7 +313,7 @@
 
 static void gen_width_changed (GtkSpinButton *spin, gpointer user_data) {
   weed_plant_t *ctmpl=(weed_plant_t *)user_data;
-  gint val=gtk_spin_button_get_value_as_int(spin);
+  gint val=lives_spin_button_get_value_as_int(spin);
   int error,old_val=0;
   gint step;
 
@@ -325,13 +325,13 @@
 
   val=step_val(val,step);
   weed_set_int_value(ctmpl,"host_width",val);
-  gtk_spin_button_set_value(spin,(gdouble)val);
+  lives_spin_button_set_value(spin,(gdouble)val);
 }
 
 
 static void gen_height_changed (GtkSpinButton *spin, gpointer user_data) {
   weed_plant_t *ctmpl=(weed_plant_t *)user_data;
-  gint val=gtk_spin_button_get_value_as_int(spin);
+  gint val=lives_spin_button_get_value_as_int(spin);
   int error,old_val=0;
   gint step;
 
@@ -343,13 +343,13 @@
 
   val=step_val(val,step);
   weed_set_int_value(ctmpl,"host_height",val);
-  gtk_spin_button_set_value(spin,(gdouble)val);
+  lives_spin_button_set_value(spin,(gdouble)val);
 }
 
 
 static void gen_fps_changed (GtkSpinButton *spin, gpointer user_data) {
   weed_plant_t *filter=(weed_plant_t *)user_data;
-  gdouble val=gtk_spin_button_get_value(spin);
+  gdouble val=lives_spin_button_get_value(spin);
   weed_set_double_value(filter,"host_fps",val);
 }
 
@@ -431,7 +431,7 @@
   gchar *tmp,*tmp2;
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
 
   radiobutton_in=lives_standard_radio_button_new(_ ("Transition _In"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_in));
@@ -451,7 +451,7 @@
     hbox2 = lives_hbox_new (FALSE, 0);
 
     if (has_video_chans_in(filter,FALSE)) 
-      gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
     checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Crossfade audio"))),FALSE,LIVES_BOX(hbox2),
 						   (tmp2=g_strdup(_("Check the box to make audio transition with the video"))));
@@ -484,7 +484,7 @@
   }
 
   hseparator = lives_hseparator_new ();
-  gtk_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
+  lives_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
 
 }
 
@@ -529,7 +529,7 @@
     add_hsep_to_box(vbox);
 
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+    lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
     
     add_fill_to_box(GTK_BOX(hbox));
     
@@ -572,8 +572,8 @@
     g_free(ltxt);
 
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
 
 
     if (weed_plant_has_leaf(tmpl,"host_width")) def_width=weed_get_int_value(tmpl,"host_width",&error);
@@ -649,7 +649,7 @@
 
   gchar *tmp,*tmp2;
 
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
   
   radiobutton = lives_standard_radio_button_new ((tmp=g_strdup(_ ("Generate to _Clipboard"))),
 						 TRUE,radiobutton_group,LIVES_BOX(hbox),
@@ -668,7 +668,7 @@
   g_free(tmp); g_free(tmp2);
 
   hseparator = lives_hseparator_new ();
-  gtk_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
+  lives_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
 
   lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), !mainw->gen_to_clipboard);
 
@@ -827,14 +827,14 @@
     // rendered fx preview
 
     GtkWidget *hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (top_dialog_vbox), hbox, FALSE, FALSE, 0);
+    lives_box_pack_start (GTK_BOX (top_dialog_vbox), hbox, FALSE, FALSE, 0);
 
     lives_widget_set_hexpand(hbox,TRUE);
     lives_widget_set_vexpand(hbox,TRUE);
 
 
     pbox = lives_vbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), pbox, FALSE, FALSE, 0);
+    lives_box_pack_start (GTK_BOX (hbox), pbox, FALSE, FALSE, 0);
 
     lives_widget_set_hexpand(pbox,TRUE);
     lives_widget_set_vexpand(pbox,TRUE);
@@ -866,41 +866,41 @@
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
     
-  fxw_accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  fxw_accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (fx_dialog[n]), fxw_accel_group);
 
   dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (fx_dialog[n]));
 
   if (!no_process||is_defaults||rfx->status==RFX_STATUS_SCRAP) {
     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
-    gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), cancelbutton, GTK_RESPONSE_CANCEL);
-    gtk_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group,
+    lives_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), cancelbutton, GTK_RESPONSE_CANCEL);
+    lives_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group,
 				LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
     if (is_defaults) {
-      okbutton = gtk_button_new_with_mnemonic (_("Set as default"));
-      if (!has_param) gtk_widget_set_sensitive(okbutton,FALSE);
-      resetbutton = gtk_button_new_with_mnemonic (_("Reset"));
-      if (!has_param) gtk_widget_set_sensitive(resetbutton,FALSE);
-      gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), resetbutton, LIVES_RESET);
+      okbutton = lives_button_new_with_mnemonic (_("Set as default"));
+      if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
+      resetbutton = lives_button_new_with_mnemonic (_("Reset"));
+      if (!has_param) lives_widget_set_sensitive(resetbutton,FALSE);
+      lives_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), resetbutton, LIVES_RESET);
     }
     else okbutton = gtk_button_new_from_stock ("gtk-ok");
-    gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), okbutton, GTK_RESPONSE_OK);
+    lives_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), okbutton, GTK_RESPONSE_OK);
   }
   else {
-    okbutton = gtk_button_new_with_mnemonic (_("Set as default"));
-    if (!has_param) gtk_widget_set_sensitive(okbutton,FALSE);
-    cancelbutton = gtk_button_new_with_mnemonic (_("Close _window"));
+    okbutton = lives_button_new_with_mnemonic (_("Set as default"));
+    if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
+    cancelbutton = lives_button_new_with_mnemonic (_("Close _window"));
     if (no_process) {
       set_button_width(dialog_action_area,okbutton,DEF_BUTTON_WIDTH);
     }
     if (rfx->status==RFX_STATUS_WEED) {
-      resetbutton = gtk_button_new_with_mnemonic (_("Reset"));
-      gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), resetbutton, LIVES_RESET);
-      gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), okbutton, GTK_RESPONSE_OK);
+      resetbutton = lives_button_new_with_mnemonic (_("Reset"));
+      lives_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), resetbutton, LIVES_RESET);

LiVES-2.0.3.tar.bz2/src/plugins.c -> LiVES-2.0.4.tar.bz2/src/plugins.c Changed

@@ -580,7 +580,7 @@
   _vppaw *vppw=(_vppaw *)user_data;
   _vid_playback_plugin *vpp=vppw->plugin;
 
-  gtk_widget_destroy(vppw->dialog);
+  lives_widget_destroy(vppw->dialog);
   lives_widget_context_update();
   if (vpp!=NULL&&vpp!=mainw->vpp) {
     // close the temp current vpp
@@ -595,7 +595,7 @@
   g_free(vppw);
 
   if (prefsw!=NULL) {
-    gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
+    lives_window_present(GTK_WINDOW(prefsw->prefs_dialog));
     gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));
   }
 }
@@ -613,11 +613,11 @@
   _vid_playback_plugin *vpp=vppw->plugin;
 
   if (vpp==mainw->vpp) {
-    if (vppw->spinbuttonw!=NULL) mainw->vpp->fwidth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonw));
-    if (vppw->spinbuttonh!=NULL) mainw->vpp->fheight=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonh));
-    if (vppw->fps_entry!=NULL) fixed_fps=gtk_entry_get_text(GTK_ENTRY(vppw->fps_entry));
+    if (vppw->spinbuttonw!=NULL) mainw->vpp->fwidth=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonw));
+    if (vppw->spinbuttonh!=NULL) mainw->vpp->fheight=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonh));
+    if (vppw->fps_entry!=NULL) fixed_fps=lives_entry_get_text(GTK_ENTRY(vppw->fps_entry));
     if (vppw->pal_entry!=NULL) {
-      cur_pal=g_strdup(gtk_entry_get_text(GTK_ENTRY(vppw->pal_entry)));
+      cur_pal=g_strdup(lives_entry_get_text(GTK_ENTRY(vppw->pal_entry)));
 
       if (get_token_count(cur_pal,' ')>1) {
 	gchar **array=g_strsplit(cur_pal," ",2);
@@ -747,14 +747,14 @@
   }
   else {
     if (vppw->spinbuttonw!=NULL) 
-      future_prefs->vpp_fwidth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonw));
+      future_prefs->vpp_fwidth=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonw));
     else future_prefs->vpp_fwidth=-1;
     if (vppw->spinbuttonh!=NULL) 
-      future_prefs->vpp_fheight=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonh));
+      future_prefs->vpp_fheight=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(vppw->spinbuttonh));
     else future_prefs->vpp_fheight=-1;
-    if (vppw->fps_entry!=NULL) fixed_fps=gtk_entry_get_text(GTK_ENTRY(vppw->fps_entry));
+    if (vppw->fps_entry!=NULL) fixed_fps=lives_entry_get_text(GTK_ENTRY(vppw->fps_entry));
     if (vppw->pal_entry!=NULL) {
-      cur_pal=g_strdup(gtk_entry_get_text(GTK_ENTRY(vppw->pal_entry)));
+      cur_pal=g_strdup(lives_entry_get_text(GTK_ENTRY(vppw->pal_entry)));
 
       if (get_token_count(cur_pal,' ')>1) {
 	gchar **array=g_strsplit(cur_pal," ",2);
@@ -917,7 +917,7 @@
   vppa->dialog = lives_standard_dialog_new (title,FALSE);
   g_free(title);
 
-  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (vppa->dialog), accel_group);
 
   if (prefs->show_gui) {
@@ -935,7 +935,7 @@
     desc=(tmpvpp->get_description)();
     if (desc!=NULL) {
       label = lives_standard_label_new (desc);
-      gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
     }
   }
 
@@ -971,12 +971,12 @@
 
     if (tmpvpp->fixed_fps_numer>0) {
       gchar *tmp=g_strdup_printf("%d:%d",tmpvpp->fixed_fps_numer,tmpvpp->fixed_fps_denom);
-      gtk_entry_set_text(GTK_ENTRY(vppa->fps_entry),tmp);
+      lives_entry_set_text(GTK_ENTRY(vppa->fps_entry),tmp);
       g_free(tmp);
     }
     else {
       gchar *tmp=remove_trailing_zeroes(tmpvpp->fixed_fpsd);
-      gtk_entry_set_text(GTK_ENTRY(vppa->fps_entry),tmp);
+      lives_entry_set_text(GTK_ENTRY(vppa->fps_entry),tmp);
       g_free(tmp);
     }
   }
@@ -986,7 +986,7 @@
 
   if (!(tmpvpp->capabilities&VPP_LOCAL_DISPLAY)) {
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     
     add_fill_to_box(GTK_BOX(hbox));
 
@@ -1038,7 +1038,7 @@
 			      weed_yuv_clamping_get_name(tmpvpp->YUV_clamping));
     }
     if (ctext==NULL) ctext=g_strdup(weed_palette_get_name(tmpvpp->palette));
-    gtk_entry_set_text(GTK_ENTRY(vppa->pal_entry),ctext);
+    lives_entry_set_text(GTK_ENTRY(vppa->pal_entry),ctext);
     g_free(ctext);
     g_list_free_strings(pal_list_strings);
     g_list_free(pal_list_strings);
@@ -1049,7 +1049,7 @@
   if (tmpvpp->get_init_rfx!=NULL) {
     GtkWidget *vbox=lives_vbox_new (FALSE, 0);
     GtkWidget *scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V/2, vbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+    lives_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
 #ifndef IS_MINGW
     com=g_strdup_printf("/bin/echo -e \"%s\"",(*tmpvpp->get_init_rfx)());
@@ -1072,20 +1072,20 @@
 
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
   lives_widget_set_can_focus (cancelbutton,TRUE);
 
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+  lives_widget_add_accelerator (cancelbutton, "activate", accel_group,
                               LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
 
   savebutton = gtk_button_new_from_stock ("gtk-save-as");
-  gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), savebutton, 1);
+  lives_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), savebutton, 1);
   lives_widget_set_can_focus (savebutton,TRUE);
-  gtk_widget_set_tooltip_text( savebutton, _("Save settings to an alternate file.\n"));
+  lives_widget_set_tooltip_text( savebutton, _("Save settings to an alternate file.\n"));
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), okbutton, GTK_RESPONSE_OK);
+  lives_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), okbutton, GTK_RESPONSE_OK);
   lives_widget_set_can_focus_and_default (okbutton);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
@@ -1102,8 +1102,8 @@
 
 
 
-  gtk_widget_show_all(vppa->dialog);
-  gtk_window_present (GTK_WINDOW (vppa->dialog));
+  lives_widget_show_all(vppa->dialog);
+  lives_window_present (GTK_WINDOW (vppa->dialog));
   gdk_window_raise(lives_widget_get_xwindow(vppa->dialog));
 
   return vppa;
@@ -1493,9 +1493,9 @@
   }
   mainw->stream_ticks=-1;
 
-  if (mainw->playing_file>-1&&mainw->fs&&mainw->sep_win) gtk_window_fullscreen(GTK_WINDOW(mainw->play_window));
+  if (mainw->playing_file>-1&&mainw->fs&&mainw->sep_win) lives_window_fullscreen(GTK_WINDOW(mainw->play_window));
   if (mainw->play_window!=NULL) 
-    gtk_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Play Window"));
+    lives_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Play Window"));
 }
 
 
@@ -2031,9 +2031,9 @@
       }
     }
     if (rdet!=NULL&&!rdet->is_encoding) {
-      rdet->arate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-      rdet->achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-      rdet->asamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+      rdet->arate=(gint)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+      rdet->achans=(gint)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+      rdet->asamps=(gint)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
       rdet->aendian=get_signed_endian(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned)),
 				      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend)));
 
@@ -2062,13 +2062,13 @@
 	      rdet->fps=(best_fps_num*1.)/(best_fps_denom*1.);
 	    }
 	    else rdet->fps=best_fps;
-	    gtk_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_fps),rdet->fps);
+	    lives_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_fps),rdet->fps);
 	  }
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_width),rdet->width);
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_height),rdet->height);
+	  lives_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_width),rdet->width);
+	  lives_spin_button_set_value(GTK_SPIN_BUTTON(rdet->spinbutton_height),rdet->height);
 	  if (best_arate!=-1) {
 	    arate_string=g_strdup_printf("%d",best_arate);
-	    gtk_entry_set_text (GTK_ENTRY (resaudw->entry_arate),arate_string);
+	    lives_entry_set_text (GTK_ENTRY (resaudw->entry_arate),arate_string);
 	    g_free(arate_string);
 	  }
 	  rdet->suggestion_followed=TRUE;
@@ -2476,7 +2476,7 @@
   lives_general_button_clicked(button,NULL);
 
   if (prefsw!=NULL) {
-    gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
+    lives_window_present(GTK_WINDOW(prefsw->prefs_dialog));
     gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));

LiVES-2.0.3.tar.bz2/src/preferences.c -> LiVES-2.0.4.tar.bz2/src/preferences.c Changed

@@ -32,13 +32,13 @@
 #ifdef ENABLE_OSC
 static void on_osc_enable_toggled (GtkToggleButton *t1, gpointer t2) {
   if (prefs->osc_udp_started) return;
-  gtk_widget_set_sensitive (prefsw->spinbutton_osc_udp,lives_toggle_button_get_active (t1)||
+  lives_widget_set_sensitive (prefsw->spinbutton_osc_udp,lives_toggle_button_get_active (t1)||
 			    lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (t2)));
 }
 #endif
 
 static void instopen_toggled (GtkToggleButton *t1, GtkWidget *button) {
-  gtk_widget_set_sensitive (button,lives_toggle_button_get_active (t1));
+  lives_widget_set_sensitive (button,lives_toggle_button_get_active (t1));
 }
 
 
@@ -425,16 +425,16 @@
 
 boolean apply_prefs(boolean skip_warn) {
   // set current prefs from prefs dialog
-  const gchar *video_open_command=gtk_entry_get_text(GTK_ENTRY(prefsw->video_open_entry));
-  const gchar *audio_play_command=gtk_entry_get_text(GTK_ENTRY(prefsw->audio_command_entry));
-  const gchar *def_vid_load_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->vid_load_dir_entry));
-  const gchar *def_vid_save_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->vid_save_dir_entry));
-  const gchar *def_audio_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->audio_dir_entry));
-  const gchar *def_image_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->image_dir_entry));
-  const gchar *def_proj_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->proj_dir_entry));
-  const gchar *wp_path=gtk_entry_get_text(GTK_ENTRY(prefsw->wpp_entry));
-  const gchar *frei0r_path=gtk_entry_get_text(GTK_ENTRY(prefsw->frei0r_entry));
-  const gchar *ladspa_path=gtk_entry_get_text(GTK_ENTRY(prefsw->ladspa_entry));
+  const gchar *video_open_command=lives_entry_get_text(GTK_ENTRY(prefsw->video_open_entry));
+  const gchar *audio_play_command=lives_entry_get_text(GTK_ENTRY(prefsw->audio_command_entry));
+  const gchar *def_vid_load_dir=lives_entry_get_text(GTK_ENTRY(prefsw->vid_load_dir_entry));
+  const gchar *def_vid_save_dir=lives_entry_get_text(GTK_ENTRY(prefsw->vid_save_dir_entry));
+  const gchar *def_audio_dir=lives_entry_get_text(GTK_ENTRY(prefsw->audio_dir_entry));
+  const gchar *def_image_dir=lives_entry_get_text(GTK_ENTRY(prefsw->image_dir_entry));
+  const gchar *def_proj_dir=lives_entry_get_text(GTK_ENTRY(prefsw->proj_dir_entry));
+  const gchar *wp_path=lives_entry_get_text(GTK_ENTRY(prefsw->wpp_entry));
+  const gchar *frei0r_path=lives_entry_get_text(GTK_ENTRY(prefsw->frei0r_entry));
+  const gchar *ladspa_path=lives_entry_get_text(GTK_ENTRY(prefsw->ladspa_entry));
 
   gchar tmpdir[PATH_MAX];
   gchar *theme = lives_combo_get_active_text( LIVES_COMBO(prefsw->theme_combo) );
@@ -447,12 +447,12 @@
 
   boolean needs_restart=FALSE;
 
-  double default_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_def_fps));
+  double default_fps=lives_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_def_fps));
 
   boolean antialias=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_antialias));
   boolean fx_threads=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_threads));
 
-  int nfx_threads=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_nfx_threads));
+  int nfx_threads=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_nfx_threads));
 
   boolean stop_screensaver=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->stop_screensaver_check));
   boolean open_maximised=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->open_maximised_check));
@@ -461,8 +461,8 @@
   boolean stream_audio_out=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio));
   boolean rec_after_pb=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb));
 
-  guint64 ds_warn_level=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_ds))*1000000;
-  guint64 ds_crit_level=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_crit_ds))*1000000;
+  guint64 ds_warn_level=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_ds))*1000000;
+  guint64 ds_crit_level=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_crit_ds))*1000000;
 
   boolean warn_fps=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_fps));
   boolean warn_save_set=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_save_set));
@@ -512,9 +512,9 @@
   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));
 
-  int fsize_to_warn=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_fsize));
-  int dl_bwidth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_bwidth));
-  int ocp=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_ocp));
+  int fsize_to_warn=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_fsize));
+  int dl_bwidth=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_bwidth));
+  int ocp=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_ocp));
 
   boolean rec_frames=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rframes));
   boolean rec_fps=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rfps));
@@ -529,15 +529,15 @@
   boolean mt_enter_prompt=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_enter_prompt));
   boolean render_prompt=!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_render_prompt));
 
-  int mt_def_width=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_width));
-  int mt_def_height=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_height));
-  int mt_def_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_fps));
-  int mt_def_arate=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-  int mt_def_achans=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-  int mt_def_asamps=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+  int mt_def_width=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_width));
+  int mt_def_height=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_height));
+  int mt_def_fps=lives_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_fps));
+  int mt_def_arate=atoi(lives_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+  int mt_def_achans=atoi(lives_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+  int mt_def_asamps=atoi(lives_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
   int mt_def_signed_endian=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))*
     AFORM_UNSIGNED+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))*AFORM_BIG_ENDIAN;
-  int mt_undo_buf=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_undo_buf));
+  int mt_undo_buf=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_undo_buf));
 
   boolean mt_exit_render=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render));
   boolean mt_enable_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton));
@@ -547,9 +547,9 @@
   boolean mt_autoback_always=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_always));
   boolean mt_autoback_never=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_never));
 
-  int mt_autoback_time=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time));
-  int gui_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_gmoni));
-  int play_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_pmoni));
+  int mt_autoback_time=lives_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time));
+  int gui_monitor=lives_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_gmoni));
+  int play_monitor=lives_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_pmoni));
 
   boolean forcesmon=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->forcesmon));
   boolean startup_ce=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_ce));
@@ -585,25 +585,25 @@
 #endif
 
 #ifdef ENABLE_OSC
-  guint osc_udp_port=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_osc_udp));
+  guint osc_udp_port=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_osc_udp));
   boolean osc_start=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC_start));
   boolean osc_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC));
 #endif
 
-  int rte_keys_virtual=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rte_keys));
+  int rte_keys_virtual=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rte_keys));
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
   boolean omc_js_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_js));
-  const gchar *omc_js_fname=gtk_entry_get_text(GTK_ENTRY(prefsw->omc_js_entry));
+  const gchar *omc_js_fname=lives_entry_get_text(GTK_ENTRY(prefsw->omc_js_entry));
 #endif
 
 
 #ifdef OMC_MIDI_IMPL
   boolean omc_midi_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_midi));
-  const gchar *omc_midi_fname=gtk_entry_get_text(GTK_ENTRY(prefsw->omc_midi_entry));
-  int midicr=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midicr));
-  int midirpt=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midirpt));
+  const gchar *omc_midi_fname=lives_entry_get_text(GTK_ENTRY(prefsw->omc_midi_entry));
+  int midicr=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midicr));
+  int midirpt=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midirpt));
 
 #ifdef ALSA_MIDI
   boolean use_alsa_midi=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->alsa_midi));
@@ -612,7 +612,7 @@
 #endif
 #endif
 
-  int rec_gb=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rec_gb));
+  int rec_gb=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rec_gb));
 
   gchar audio_player[256];
   int listlen=g_list_length (prefs->acodec_list);
@@ -632,7 +632,7 @@
 
   gchar *tmp;
 
-  gchar *cdplay_device=g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL);
+  gchar *cdplay_device=g_filename_from_utf8(lives_entry_get_text(GTK_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL);
 
   if (capable->has_encoder_plugins) {
     audio_codec = lives_combo_get_active_text( LIVES_COMBO(prefsw->acodec_combo) );
@@ -645,7 +645,7 @@
   }
   else future_prefs->encoder.audio_codec=0;
 
-  g_snprintf (tmpdir,PATH_MAX,"%s",(tmp=g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(prefsw->tmpdir_entry)),
+  g_snprintf (tmpdir,PATH_MAX,"%s",(tmp=g_filename_from_utf8(lives_entry_get_text(GTK_ENTRY(prefsw->tmpdir_entry)),
 							     -1,NULL,NULL,NULL)));
   g_free(tmp);
 
@@ -768,7 +768,7 @@
       else {
 	g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",tmpdir);
 	set_temp_label_text(GTK_LABEL(prefsw->temp_label));
-	gtk_widget_queue_draw(prefsw->temp_label);
+	lives_widget_queue_draw(prefsw->temp_label);
 	lives_widget_context_update(); // update prefs window before showing confirmation box
 
 	msg=g_strdup (_ ("You have chosen to change the temporary directory.\nPlease make sure you have no other copies of LiVES open.\n\nIf you do have other copies of LiVES open, please close them now, *before* pressing OK.\n\nAlternatively, press Cancel to restore the temporary directory to its original setting."));	
@@ -778,7 +778,7 @@
 	}
 	else {
 	  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
-          gtk_entry_set_text(GTK_ENTRY(prefsw->tmpdir_entry), prefs->tmpdir);
+          lives_entry_set_text(GTK_ENTRY(prefsw->tmpdir_entry), prefs->tmpdir);
 	}
       }
       g_free (msg);
@@ -864,12 +864,12 @@
     prefs->show_recent=show_recent;
     set_boolean_pref("show_recent_files",show_recent);
     if (prefs->show_recent) {
-      gtk_widget_show (mainw->recent_menu);

LiVES-2.0.3.tar.bz2/src/resample.c -> LiVES-2.0.4.tar.bz2/src/resample.c Changed

@@ -709,7 +709,7 @@
   mainw->fx3_val=cfile->asampsize;
   mainw->fx4_val=cfile->signed_endian;
   resaudw=create_resaudw(1,NULL,NULL);
-  gtk_widget_show (resaudw->dialog);
+  lives_widget_show (resaudw->dialog);
 
 }
 
@@ -725,9 +725,9 @@
   boolean has_lmap_error=FALSE;
 
   if (button!=NULL) {
-    arps=arate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-    achans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-    asampsize=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+    arps=arate=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+    achans=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+    asampsize=(int)atoi (lives_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       asigned=0;
     }
@@ -735,7 +735,7 @@
       aendian=0;
     }
 
-    gtk_widget_destroy (resaudw->dialog);
+    lives_widget_destroy (resaudw->dialog);
     mainw->noswitch=TRUE;
     lives_widget_context_update();
     mainw->noswitch=noswitch;
@@ -879,45 +879,45 @@
   gchar *tmp;
 
   if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widg))) {
-    gtk_widget_set_sensitive (resaudw->rb_signed,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_bigend,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_littleend,FALSE);
-    gtk_widget_set_sensitive (resaudw->entry_arate,FALSE);
-    gtk_widget_set_sensitive (resaudw->entry_asamps,FALSE);
-    gtk_widget_set_sensitive (resaudw->entry_achans,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_signed,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_bigend,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_littleend,FALSE);
+    lives_widget_set_sensitive (resaudw->entry_arate,FALSE);
+    lives_widget_set_sensitive (resaudw->entry_asamps,FALSE);
+    lives_widget_set_sensitive (resaudw->entry_achans,FALSE);
     if (prefsw!=NULL) {
-      gtk_widget_set_sensitive (prefsw->pertrack_checkbutton,FALSE);
-      gtk_widget_set_sensitive (prefsw->backaudio_checkbutton,FALSE);
+      lives_widget_set_sensitive (prefsw->pertrack_checkbutton,FALSE);
+      lives_widget_set_sensitive (prefsw->backaudio_checkbutton,FALSE);
       lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton),FALSE);
       lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton),FALSE);
     }
     else if (rdet!=NULL) {
       lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton),FALSE);
       lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton),FALSE);
-      gtk_widget_set_sensitive(rdet->pertrack_checkbutton,FALSE);
-      gtk_widget_set_sensitive(rdet->backaudio_checkbutton,FALSE);
+      lives_widget_set_sensitive(rdet->pertrack_checkbutton,FALSE);
+      lives_widget_set_sensitive(rdet->backaudio_checkbutton,FALSE);
     }
   }
   else {
-    if (atoi (gtk_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))!=8) {
-      gtk_widget_set_sensitive (resaudw->rb_bigend,TRUE);
-      gtk_widget_set_sensitive (resaudw->rb_littleend,TRUE);
+    if (atoi (lives_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))!=8) {
+      lives_widget_set_sensitive (resaudw->rb_bigend,TRUE);
+      lives_widget_set_sensitive (resaudw->rb_littleend,TRUE);
     }
-    gtk_widget_set_sensitive (resaudw->entry_arate,TRUE);
-    gtk_widget_set_sensitive (resaudw->entry_asamps,TRUE);
-    gtk_widget_set_sensitive (resaudw->entry_achans,TRUE);
+    lives_widget_set_sensitive (resaudw->entry_arate,TRUE);
+    lives_widget_set_sensitive (resaudw->entry_asamps,TRUE);
+    lives_widget_set_sensitive (resaudw->entry_achans,TRUE);
     if (prefsw!=NULL) {
-      gtk_widget_set_sensitive (prefsw->pertrack_checkbutton,TRUE);
-      gtk_widget_set_sensitive (prefsw->backaudio_checkbutton,TRUE);
+      lives_widget_set_sensitive (prefsw->pertrack_checkbutton,TRUE);
+      lives_widget_set_sensitive (prefsw->backaudio_checkbutton,TRUE);
     }
     if (rdet!=NULL) {
-      gtk_widget_set_sensitive(rdet->backaudio_checkbutton,TRUE);
-      gtk_widget_set_sensitive(rdet->pertrack_checkbutton,TRUE);
+      lives_widget_set_sensitive(rdet->backaudio_checkbutton,TRUE);
+      lives_widget_set_sensitive(rdet->pertrack_checkbutton,TRUE);
     }
 
     tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_CHANS);
-    gtk_entry_set_text (GTK_ENTRY (resaudw->entry_achans),tmp);
+    lives_entry_set_text (GTK_ENTRY (resaudw->entry_achans),tmp);
     g_free (tmp);
 
   }
@@ -928,19 +928,19 @@
 
 void 
 on_resaudw_asamps_changed (GtkWidget *irrelevant, gpointer rubbish) {
-  if (atoi (gtk_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))==8) {
-    gtk_widget_set_sensitive (resaudw->rb_bigend,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_littleend,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_signed,FALSE);
-    gtk_widget_set_sensitive (resaudw->rb_unsigned,TRUE);
+  if (atoi (lives_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))==8) {
+    lives_widget_set_sensitive (resaudw->rb_bigend,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_littleend,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_signed,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_unsigned,TRUE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
   }
   else {
-    gtk_widget_set_sensitive (resaudw->rb_bigend,TRUE);
-    gtk_widget_set_sensitive (resaudw->rb_littleend,TRUE);
-    if (atoi (gtk_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))==16) {
-      gtk_widget_set_sensitive (resaudw->rb_signed,TRUE);
-      gtk_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
+    lives_widget_set_sensitive (resaudw->rb_bigend,TRUE);
+    lives_widget_set_sensitive (resaudw->rb_littleend,TRUE);
+    if (atoi (lives_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))==16) {
+      lives_widget_set_sensitive (resaudw->rb_signed,TRUE);
+      lives_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
     }
   }
@@ -1204,7 +1204,7 @@
     resaudw->dialog = lives_standard_dialog_new (title,FALSE);
     g_free(title);
 
-    accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+    accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
     gtk_window_add_accel_group (GTK_WINDOW (resaudw->dialog), accel_group);
 
     if (prefs->show_gui) {
@@ -1215,23 +1215,23 @@
 
     vboxx = lives_vbox_new (FALSE, 0);
 
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), vboxx, TRUE, TRUE, 0);
+    lives_box_pack_start (GTK_BOX (dialog_vbox), vboxx, TRUE, TRUE, 0);
   }
   else vboxx=top_vbox;
 
   if (type==1) {
     frame = gtk_frame_new (NULL);
  
-    gtk_box_pack_start (GTK_BOX (vboxx), frame, TRUE, TRUE, 0);
+    lives_box_pack_start (GTK_BOX (vboxx), frame, TRUE, TRUE, 0);
     
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     
     hbox2 = lives_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox2);
-    gtk_container_add (GTK_CONTAINER (frame), hbox2);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox2), widget_opts.packing_width);
+    lives_widget_show (hbox2);
+    lives_container_add (GTK_CONTAINER (frame), hbox2);
+    lives_container_set_border_width (GTK_CONTAINER (hbox2), widget_opts.packing_width);
     
     tmp=g_strdup_printf ("%d",(int)mainw->fx1_val);
     
@@ -1256,20 +1256,20 @@
     lives_widget_set_can_focus (combo_entry1, FALSE);
 
     vseparator = lives_vseparator_new ();
-    gtk_widget_show (vseparator);
-    gtk_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
+    lives_widget_show (vseparator);
+    lives_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
     vbox = lives_vbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
+    lives_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
 
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     radiobutton_s1 = lives_standard_radio_button_new (_("Signed"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
     s1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_s1));
 
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     radiobutton_u1 = lives_standard_radio_button_new (_("Unsigned"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
 
@@ -1282,23 +1282,23 @@
       lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_s1), TRUE);
     }
 
-    gtk_widget_set_sensitive (radiobutton_u1, FALSE);
-    gtk_widget_set_sensitive (radiobutton_s1, FALSE);
+    lives_widget_set_sensitive (radiobutton_u1, FALSE);

LiVES-2.0.3.tar.bz2/src/rfx-builder.c -> LiVES-2.0.4.tar.bz2/src/rfx-builder.c Changed

@@ -25,7 +25,7 @@
 
   if (!check_builder_programs()) return;
   rfxbuilder=make_rfx_build_window(NULL,RFX_STATUS_ANY);
-  gtk_widget_show (rfxbuilder->dialog);
+  lives_widget_show (rfxbuilder->dialog);
 }
 
 void
@@ -48,8 +48,8 @@
   }
   g_free (script_name);
   rfxbuilder->mode=RFX_BUILDER_MODE_EDIT;
-  rfxbuilder->oname=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->name_entry)));
-  gtk_widget_show (rfxbuilder->dialog);
+  rfxbuilder->oname=g_strdup (lives_entry_get_text (GTK_ENTRY (rfxbuilder->name_entry)));
+  lives_widget_show (rfxbuilder->dialog);
 }
 
 
@@ -98,7 +98,7 @@
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)g_malloc (sizeof(rfx_build_window_t));
 
-  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(lives_accel_group_new ());
 
   gchar *tmp,*tmp2,*title,*string;
 
@@ -150,7 +150,7 @@
 
   gtk_window_add_accel_group (GTK_WINDOW (rfxbuilder->dialog), accel_group);
 
-  gtk_container_set_border_width (GTK_CONTAINER (rfxbuilder->dialog), widget_opts.border_width>>1);
+  lives_container_set_border_width (GTK_CONTAINER (rfxbuilder->dialog), widget_opts.border_width>>1);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(rfxbuilder->dialog));
 
@@ -160,15 +160,15 @@
 						PREF_RFXDIALOG_W:mainw->scr_width-20.*widget_opts.scale, 
 						(PREF_RFXDIALOG_H<mainw->scr_height-60.*widget_opts.scale)?
 						PREF_RFXDIALOG_H:mainw->scr_height-60.*widget_opts.scale,top_vbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
 
   // types
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
 
 
   label = lives_standard_label_new (_("Type:"));
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
 
   string=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE);
   rfxbuilder->type_effect1_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
@@ -186,7 +186,7 @@
   g_free(string);
 
   rfxbuilder->type_tool_radiobutton = lives_standard_radio_button_new (_("tool"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
-  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton));  gtk_widget_show (label);
+  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton));  lives_widget_show (label);
 
   rfxbuilder->type_utility_radiobutton = lives_standard_radio_button_new (_("utility"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
 
@@ -200,7 +200,7 @@
 
   // version
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   rfxbuilder->spinbutton_version = lives_standard_spin_button_new ((tmp=g_strdup(_("Version:       "))),FALSE,
 								   rfxbuilder->plugin_version, rfxbuilder->plugin_version, 1000000., 1., 1., 0,
@@ -238,7 +238,7 @@
   // action description
 
   rfxbuilder->action_desc_hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->action_desc_hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->action_desc_hbox, FALSE, FALSE, widget_opts.packing_height);
 
   rfxbuilder->action_desc_entry = lives_standard_entry_new ((tmp=g_strdup(_("Action description:        "))),FALSE,NULL,-1,-1,
 							    LIVES_BOX(rfxbuilder->action_desc_hbox),
@@ -261,30 +261,30 @@
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->requirements_button=gtk_button_new_with_mnemonic (_ ("_Requirements..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->requirements_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->requirements_button,
+  rfxbuilder->requirements_button=lives_button_new_with_mnemonic (_ ("_Requirements..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->requirements_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->requirements_button,
 			(_ ("Enter any binaries required by the plugin.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->properties_button=gtk_button_new_with_mnemonic (_ ("_Properties..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->properties_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->properties_button,
+  rfxbuilder->properties_button=lives_button_new_with_mnemonic (_ ("_Properties..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->properties_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->properties_button,
 			(_ ("Set properties for the plugin. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->params_button=gtk_button_new_with_mnemonic (_ ("_Parameters..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->params_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->params_button,
+  rfxbuilder->params_button=lives_button_new_with_mnemonic (_ ("_Parameters..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->params_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->params_button,
 			(_ ("Set up parameters used in pre/loop/post/trigger code. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->param_window_button=gtk_button_new_with_mnemonic (_ ("Parameter _Window Hints..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->param_window_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->param_window_button,
+  rfxbuilder->param_window_button=lives_button_new_with_mnemonic (_ ("Parameter _Window Hints..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->param_window_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->param_window_button,
 			(_ ("Set hints about how to lay out the parameter window. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
@@ -301,30 +301,30 @@
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->pre_button=gtk_button_new_with_mnemonic (_ ("_Pre loop code..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->pre_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->pre_button,
+  rfxbuilder->pre_button=lives_button_new_with_mnemonic (_ ("_Pre loop code..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->pre_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->pre_button,
 			(_ ("Code to be executed before the loop. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->loop_button=gtk_button_new_with_mnemonic (_ ("_Loop code..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->loop_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->loop_button,
+  rfxbuilder->loop_button=lives_button_new_with_mnemonic (_ ("_Loop code..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->loop_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->loop_button,
 			(_ ("Loop code to be applied to each frame.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->post_button=gtk_button_new_with_mnemonic (_ ("_Post loop code..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->post_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->post_button,
+  rfxbuilder->post_button=lives_button_new_with_mnemonic (_ ("_Post loop code..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->post_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->post_button,
 			(_ ("Code to be executed after the loop. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->trigger_button=gtk_button_new_with_mnemonic (_ ("_Trigger code..."));
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->trigger_button, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->trigger_button,
+  rfxbuilder->trigger_button=lives_button_new_with_mnemonic (_ ("_Trigger code..."));
+  lives_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->trigger_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text( rfxbuilder->trigger_button,
 			(_ ("Set trigger code for when the parameter window is shown, or when a parameter is changed. Optional (except for Utilities).")));
 
 
@@ -332,16 +332,16 @@
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), okbutton, GTK_RESPONSE_OK);
+  lives_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), okbutton, GTK_RESPONSE_OK);
   lives_widget_set_can_focus_and_default (okbutton);
 
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+  lives_widget_add_accelerator (cancelbutton, "activate", accel_group,
                               LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+  lives_widget_add_accelerator (okbutton, "activate", accel_group,
                               LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
 
 
@@ -449,10 +449,10 @@
     }
   }
   else {
-    gtk_widget_grab_focus (rfxbuilder->name_entry);
+    lives_widget_grab_focus (rfxbuilder->name_entry);
   }
 
-  gtk_widget_show_all(rfxbuilder->dialog);

LiVES-2.0.3.tar.bz2/src/rte_window.c -> LiVES-2.0.4.tar.bz2/src/rte_window.c Changed

@@ -64,19 +64,19 @@
   gchar *type=rte_keymode_get_type(key+1,mode);
 
   if (strlen(type)) {
-    gtk_label_set_text (GTK_LABEL(type_labels[idx]),g_strdup_printf(_("Type: %s"),type));
-    gtk_widget_set_sensitive(info_buttons[idx],TRUE);
-    gtk_widget_set_sensitive(clear_buttons[idx],TRUE);
-    gtk_widget_set_sensitive(mode_radios[idx],TRUE);
-    gtk_widget_set_sensitive(nlabels[idx],TRUE);
-    gtk_widget_set_sensitive(type_labels[idx],TRUE);
+    lives_label_set_text (GTK_LABEL(type_labels[idx]),g_strdup_printf(_("Type: %s"),type));
+    lives_widget_set_sensitive(info_buttons[idx],TRUE);
+    lives_widget_set_sensitive(clear_buttons[idx],TRUE);
+    lives_widget_set_sensitive(mode_radios[idx],TRUE);
+    lives_widget_set_sensitive(nlabels[idx],TRUE);
+    lives_widget_set_sensitive(type_labels[idx],TRUE);
   }
   else {
-    gtk_widget_set_sensitive(info_buttons[idx],FALSE);
-    gtk_widget_set_sensitive(clear_buttons[idx],FALSE);
-    gtk_widget_set_sensitive(mode_radios[idx],FALSE);
-    gtk_widget_set_sensitive(nlabels[idx],FALSE);
-    gtk_widget_set_sensitive(type_labels[idx],FALSE);
+    lives_widget_set_sensitive(info_buttons[idx],FALSE);
+    lives_widget_set_sensitive(clear_buttons[idx],FALSE);
+    lives_widget_set_sensitive(mode_radios[idx],FALSE);
+    lives_widget_set_sensitive(nlabels[idx],FALSE);
+    lives_widget_set_sensitive(type_labels[idx],FALSE);
   }
   g_free(type);
 }
@@ -105,13 +105,13 @@
     for (j=modes-1;j>=0;j--) {
       weed_delete_effectkey (i+1,j);
       if (rte_window!=NULL) {
-	gtk_entry_set_text (GTK_ENTRY(combo_entries[i*modes+j]),"");
+	lives_entry_set_text (GTK_ENTRY(combo_entries[i*modes+j]),"");
 	type_label_set_text(i,j);
       }
     }
   }
 
-  if (button!=NULL) gtk_widget_set_sensitive (GTK_WIDGET(button), FALSE);
+  if (button!=NULL) lives_widget_set_sensitive (GTK_WIDGET(button), FALSE);
 
   return FALSE;
 }
@@ -697,7 +697,7 @@
     }
   }
 
-  gtk_widget_set_sensitive (GTK_WIDGET(clear_all_button), hasone);
+  lives_widget_set_sensitive (GTK_WIDGET(clear_all_button), hasone);
 }
 
 
@@ -1487,7 +1487,7 @@
       continue;
     }
     if (rte_window!=NULL) {
-      gtk_entry_set_text (GTK_ENTRY(combo_entries[(key-1)*modes+mode]),(tmp=rte_keymode_get_filter_name(key,mode)));
+      lives_entry_set_text (GTK_ENTRY(combo_entries[(key-1)*modes+mode]),(tmp=rte_keymode_get_filter_name(key,mode)));
       g_free(tmp);
       type_label_set_text(key-1,mode);
     }
@@ -1600,48 +1600,48 @@
   filter_version=weed_get_int_value(filter,"version",&weed_error);
 
   rte_info_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (rte_info_window), g_strdup_printf(_("LiVES: Information for %s"),filter_name));
+  lives_window_set_title (GTK_WINDOW (rte_info_window), g_strdup_printf(_("LiVES: Information for %s"),filter_name));
   lives_widget_set_bg_color(rte_info_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  gtk_container_set_border_width (GTK_CONTAINER (rte_info_window), widget_opts.border_width);
-  gtk_window_set_transient_for(GTK_WINDOW(rte_info_window),GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button))));
+  lives_container_set_border_width (GTK_CONTAINER (rte_info_window), widget_opts.border_width);
+  gtk_window_set_transient_for(GTK_WINDOW(rte_info_window),GTK_WINDOW(lives_widget_get_toplevel(GTK_WIDGET(button))));
   gtk_window_set_position (GTK_WINDOW (rte_info_window), GTK_WIN_POS_CENTER_ALWAYS);
   gtk_window_set_default_size (GTK_WINDOW (rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT);
 
   vbox = lives_vbox_new (FALSE, widget_opts.packing_height*2);
-  gtk_container_add (GTK_CONTAINER (rte_info_window), vbox);
+  lives_container_add (GTK_CONTAINER (rte_info_window), vbox);
 
   label = lives_standard_label_new ((tmp=g_strdup_printf(_("Effect name: %s"),filter_name)));
   g_free(tmp);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   label = lives_standard_label_new ((tmp=g_strdup_printf(_("Type: %s"),type)));
   g_free(tmp);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   label = lives_standard_label_new ((tmp=g_strdup_printf(_("Plugin name: %s"),plugin_name)));
   g_free(tmp);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   label = lives_standard_label_new ((tmp=g_strdup_printf(_("Author: %s"),filter_author)));
   g_free(tmp);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   if (filter_extra_authors!=NULL) {
     label = lives_standard_label_new ((tmp=g_strdup_printf(_("and: %s"),filter_extra_authors)));
     g_free(tmp);
-    gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+    lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
   }
 
   label = lives_standard_label_new ((tmp=g_strdup_printf(_("Version: %d"),filter_version)));
   g_free(tmp);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
   label = lives_standard_label_new (_("Description: "));
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  lives_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
   textview = gtk_text_view_new ();
 
@@ -1655,15 +1655,15 @@
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview), FALSE);
   
   text_view_set_text (LIVES_TEXT_VIEW(textview), filter_description,-1);
-  gtk_box_pack_start (GTK_BOX (hbox), textview, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (hbox), textview, TRUE, TRUE, 0);
   
   hbuttonbox = lives_hbutton_box_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
+  lives_box_pack_start (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
 
   ok_button = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (ok_button);
+  lives_widget_show (ok_button);
 
-  gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
+  lives_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
   lives_widget_set_can_focus_and_default (ok_button);
   gtk_widget_grab_default (ok_button);
 
@@ -1681,7 +1681,7 @@
   g_free(plugin_name);
   g_free(type);
 
-  gtk_widget_show_all(rte_info_window);
+  lives_widget_show_all(rte_info_window);
 
 }
 
@@ -1717,13 +1717,13 @@
     
   for (i=mode;i<rte_getmodespk()-1;i++) {
     idx=key*modes+i;
-    gtk_entry_set_text (GTK_ENTRY(combo_entries[idx]),gtk_entry_get_text(GTK_ENTRY(combo_entries[idx+1])));
+    lives_entry_set_text (GTK_ENTRY(combo_entries[idx]),lives_entry_get_text(GTK_ENTRY(combo_entries[idx+1])));
     type_label_set_text(key,i);
     pconx_remap_mode(key,i+1,i);
     cconx_remap_mode(key,i+1,i);
   }
   idx++;
-  gtk_entry_set_text (GTK_ENTRY(combo_entries[idx]),"");
+  lives_entry_set_text (GTK_ENTRY(combo_entries[idx]),"");
   type_label_set_text(key,i);
 
   if (!rte_keymode_valid(key+1,0,TRUE)) rtew_set_keych(key,FALSE);
@@ -1772,7 +1772,7 @@
 
   if (fx_dialog[1]!=NULL) {
     rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
-    gtk_widget_destroy(fx_dialog[1]);
+    lives_widget_destroy(fx_dialog[1]);
     on_paramwindow_cancel_clicked2(NULL,rfx);
   }
 
@@ -1879,8 +1879,8 @@
 
   if (gtk_combo_box_get_active(combo)==-1) return; // -1 is returned after we set our own text (without the type)
 
-  gtk_combo_box_get_active_iter(combo,&iter1);
-  model=gtk_combo_box_get_model(combo);
+  lives_combo_get_active_iter(combo,&iter1);
+  model=lives_combo_get_model(combo);
 
   gtk_tree_model_get(model,&iter1,HASH_COLUMN,&hashname1,-1);
 
@@ -1899,10 +1899,10 @@
     }
   }
 
-  gtk_widget_grab_focus (combo_entries[key_mode]);
+  lives_widget_grab_focus (combo_entries[key_mode]);
 
   if ((error=rte_switch_keymode (key+1, mode, hashname1))<0) {
-    gtk_entry_set_text (GTK_ENTRY (combo_entries[key_mode]),(tmp=rte_keymode_get_filter_name(key+1,mode)));

LiVES-2.0.3.tar.bz2/src/saveplay.c -> LiVES-2.0.4.tar.bz2/src/saveplay.c Changed

@@ -942,13 +942,13 @@
       cfile->end++;
 
       g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func);
-      gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames==0?0:1,cfile->frames);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
+      lives_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames==0?0:1,cfile->frames);
+      lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
       g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
        
       g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
-      gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_start),cfile->frames==0?0:1,cfile->frames);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
+      lives_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_start),cfile->frames==0?0:1,cfile->frames);
+      lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
       g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
       mainw->noswitch=FALSE;
@@ -1191,11 +1191,11 @@
     if (prefs->show_rdet) {
       gint response;
       rdet=create_render_details(1); // WARNING !! - rdet is global in events.h
-      response=gtk_dialog_run(GTK_DIALOG(rdet->dialog));
-      gtk_widget_hide (rdet->dialog);
+      response=lives_dialog_run(GTK_DIALOG(rdet->dialog));
+      lives_widget_hide (rdet->dialog);
       
       if (response==GTK_RESPONSE_CANCEL) {
-	gtk_widget_destroy (rdet->dialog);
+	lives_widget_destroy (rdet->dialog);
 	g_free(rdet->encoder_name);
 	g_free(rdet);
 	rdet=NULL;
@@ -1212,7 +1212,7 @@
   hbox = lives_hbox_new (FALSE, 0);
   mainw->fx1_bool=TRUE;
   add_suffix_check(GTK_BOX(hbox),prefs->encoder.of_def_ext);
-  gtk_widget_show_all(hbox);
+  lives_widget_show_all(hbox);
 
   if (filename==NULL) {
     gchar *ttl=g_strdup (_("LiVES: Save Clip as..."));
@@ -1254,7 +1254,7 @@
     if (!check_file(full_file_name,strcmp(full_file_name,n_file_name))) {
       g_free(full_file_name);
       if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
+	lives_widget_destroy (rdet->dialog);
 	g_free(rdet->encoder_name);
 	g_free(rdet);
 	rdet=NULL;
@@ -1270,7 +1270,7 @@
     if (!do_comments_dialog(sfile,full_file_name)) {
 	g_free(full_file_name);
 	if (rdet!=NULL) {
-	  gtk_widget_destroy (rdet->dialog);
+	  lives_widget_destroy (rdet->dialog);
 	  g_free(rdet->encoder_name);
 	  g_free(rdet);
 	  rdet=NULL;
@@ -1288,7 +1288,7 @@
 	g_free(warn);
 	g_free(full_file_name);
 	if (rdet!=NULL) {
-	  gtk_widget_destroy (rdet->dialog);
+	  lives_widget_destroy (rdet->dialog);
 	  g_free(rdet->encoder_name);
 	  g_free(rdet);
 	  if (resaudw!=NULL) g_free(resaudw);
@@ -1304,7 +1304,7 @@
 
 
   if (rdet!=NULL) {
-    gtk_widget_destroy (rdet->dialog);
+    lives_widget_destroy (rdet->dialog);
     g_free(rdet->encoder_name);
     g_free(rdet);
     rdet=NULL;
@@ -1377,7 +1377,7 @@
 
     if (extra_params==NULL) {
       if (fx_dialog[1]!=NULL) {
-	gtk_widget_destroy(fx_dialog[1]);
+	lives_widget_destroy(fx_dialog[1]);
 	fx_dialog[1]=NULL;
       }
       g_free(fps_string);
@@ -2139,7 +2139,7 @@
   mainw->pre_src_audio_file=mainw->current_file;
 
   // enable the freeze button
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (GdkModifierType)LIVES_CONTROL_MASK, 
+  lives_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (GdkModifierType)LIVES_CONTROL_MASK, 
 			   (GtkAccelFlags)0, (freeze_closure=g_cclosure_new (G_CALLBACK (freeze_callback),NULL,NULL)));
 
   if (mainw->multitrack!=NULL) {
@@ -2164,8 +2164,8 @@
       mainw->clip_switched=FALSE;
       // TODO
       if (mainw->current_file>0&&(cfile->undo_action==UNDO_RESAMPLE||cfile->undo_action==UNDO_RENDER)) {
-	gtk_widget_set_sensitive (mainw->undo,FALSE);
-	gtk_widget_set_sensitive (mainw->redo,FALSE);
+	lives_widget_set_sensitive (mainw->undo,FALSE);
+	lives_widget_set_sensitive (mainw->redo,FALSE);
 	cfile->undoable=cfile->redoable=FALSE;
       }
     }
@@ -2223,7 +2223,7 @@
 
     if ((!mainw->sep_win||(!mainw->faded&&(prefs->sepwin_type!=1)))&&(cfile->frames>0||mainw->foreign)) {
       // show the frame in the main window
-      gtk_widget_show(mainw->playframe);
+      lives_widget_show(mainw->playframe);
       lives_widget_context_update();
     }
   }
@@ -2263,7 +2263,7 @@
     mainw->files[mainw->blend_file]->aseek_pos=0;
   }
 
-  gtk_widget_set_sensitive(mainw->m_stopbutton,TRUE);
+  lives_widget_set_sensitive(mainw->m_stopbutton,TRUE);
   mainw->playing_file=mainw->current_file;
 
   if (!mainw->preview||!cfile->opening) {
@@ -2277,29 +2277,29 @@
   }
 
   if (mainw->double_size&&mainw->multitrack==NULL) {
-    gtk_widget_hide(mainw->scrolledwindow);
+    lives_widget_hide(mainw->scrolledwindow);
   }
 
-  gtk_widget_set_sensitive (mainw->stop, TRUE);
+  lives_widget_set_sensitive (mainw->stop, TRUE);
 
-  if (mainw->multitrack==NULL) gtk_widget_set_sensitive (mainw->m_playbutton, FALSE);
+  if (mainw->multitrack==NULL) lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
   else if (!cfile->opening) {
     if (!mainw->is_processing) mt_swap_play_pause(mainw->multitrack,TRUE);
     else {
-      gtk_widget_set_sensitive(mainw->multitrack->playall,FALSE);
-      gtk_widget_set_sensitive(mainw->m_playbutton,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->playall,FALSE);
+      lives_widget_set_sensitive(mainw->m_playbutton,FALSE);
     }
   }
 
-  gtk_widget_set_sensitive (mainw->m_playselbutton, FALSE);
-  gtk_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
-  gtk_widget_set_sensitive (mainw->m_mutebutton, (audio_player==AUD_PLAYER_JACK||audio_player==AUD_PLAYER_PULSE||
+  lives_widget_set_sensitive (mainw->m_playselbutton, FALSE);
+  lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
+  lives_widget_set_sensitive (mainw->m_mutebutton, (audio_player==AUD_PLAYER_JACK||audio_player==AUD_PLAYER_PULSE||
 						  mainw->multitrack!=NULL));
 
-  gtk_widget_set_sensitive (mainw->m_loopbutton, (!cfile->achans||mainw->mute||mainw->multitrack!=NULL||
+  lives_widget_set_sensitive (mainw->m_loopbutton, (!cfile->achans||mainw->mute||mainw->multitrack!=NULL||
 						  mainw->loop_cont||audio_player==AUD_PLAYER_JACK||
 						  audio_player==AUD_PLAYER_PULSE)&&mainw->current_file>0);
-  gtk_widget_set_sensitive (mainw->loop_continue, (!cfile->achans||mainw->mute||mainw->loop_cont||
+  lives_widget_set_sensitive (mainw->loop_continue, (!cfile->achans||mainw->mute||mainw->loop_cont||
 						   audio_player==AUD_PLAYER_JACK||audio_player==AUD_PLAYER_PULSE)
 			    &&mainw->current_file>0);
 
@@ -2340,7 +2340,7 @@
 	  else xtrabit=g_strdup("");
 	  title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
 	  if (mainw->play_window!=NULL)
-	    gtk_window_set_title (GTK_WINDOW (mainw->play_window), title);
+	    lives_window_set_title (GTK_WINDOW (mainw->play_window), title);
 	  g_free(title);
 	  g_free(xtrabit);
 	}
@@ -2356,7 +2356,7 @@
 	else {
 	  // this doesn't get called if we don't call resize_play_window()
 	  if (mainw->play_window!=NULL) {
-	    gtk_window_present (GTK_WINDOW (mainw->play_window));
+	    lives_window_present (GTK_WINDOW (mainw->play_window));
 	    gdk_window_raise(lives_widget_get_xwindow(mainw->play_window));
 	  }
 	}
@@ -2367,13 +2367,13 @@
       hide_cursor (lives_widget_get_xwindow(mainw->play_window));
       gtk_widget_set_app_paintable(mainw->play_window,TRUE);
       if (mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->fs) 
-	gtk_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
+	lives_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
       else {
 	gchar *title,*xtrabit;
 	if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
 	else xtrabit=g_strdup("");
 	title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	gtk_window_set_title (GTK_WINDOW (mainw->play_window), title);
+	lives_window_set_title (GTK_WINDOW (mainw->play_window), title);
 	g_free(title);
 	g_free(xtrabit);
       }
@@ -2389,7 +2389,7 @@

LiVES-2.0.3.tar.bz2/src/startup.c -> LiVES-2.0.4.tar.bz2/src/startup.c Changed

@@ -78,12 +78,12 @@
   tdentry=create_rename_dialog(6);
 
   while (!ok) {
-    response=gtk_dialog_run(GTK_DIALOG(tdentry->dialog));
+    response=lives_dialog_run(GTK_DIALOG(tdentry->dialog));
 
     if (response==GTK_RESPONSE_CANCEL) {
       return FALSE;
     }
-    dirname=g_strdup(gtk_entry_get_text(GTK_ENTRY(tdentry->entry)));
+    dirname=g_strdup(lives_entry_get_text(GTK_ENTRY(tdentry->entry)));
 
     if (strcmp(dirname+strlen(dirname)-1,G_DIR_SEPARATOR_S)) {
       gchar *tmp=g_strdup_printf("%s%s",dirname,G_DIR_SEPARATOR_S);
@@ -140,7 +140,7 @@
     ok=TRUE;
   }
 
-  gtk_widget_destroy(tdentry->dialog);
+  lives_widget_destroy(tdentry->dialog);
   g_free(tdentry);
 
   mainw->com_failed=FALSE;
@@ -276,20 +276,20 @@
 
   dialog = lives_standard_dialog_new (_("LiVES: - Choose an audio player"),FALSE);
 
-  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
   
   label=lives_standard_label_new(msg);
-  gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
+  lives_container_add (GTK_CONTAINER (dialog_vbox), label);
   g_free(msg);
 
 
 
 #ifdef HAVE_PULSE_AUDIO
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   radiobutton0 = lives_standard_radio_button_new ( _("Use _pulse audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton0));
@@ -311,7 +311,7 @@
 
 #ifdef ENABLE_JACK
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   radiobutton1 = lives_standard_radio_button_new(_("Use _jack audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
   radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton1));
@@ -331,7 +331,7 @@
 
   if (capable->has_sox_play) {
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     radiobutton2 = lives_standard_radio_button_new (_("Use _sox audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
     radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton2));
@@ -352,7 +352,7 @@
 
   if (capable->has_mplayer) {
     hbox = lives_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     radiobutton3 = lives_standard_radio_button_new (_("Use _mplayer audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
@@ -372,19 +372,19 @@
 
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_widget_show (cancelbutton);
+  lives_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+  lives_widget_add_accelerator (cancelbutton, "activate", accel_group,
                               LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   okbutton = gtk_button_new_from_stock ("gtk-go-forward");
-  gtk_button_set_label(GTK_BUTTON(okbutton),_("_Next"));
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
+  lives_button_set_label(GTK_BUTTON(okbutton),_("_Next"));
+  lives_widget_show (okbutton);
+  lives_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
   lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default(okbutton);
-  gtk_widget_grab_focus(okbutton);
+  lives_widget_grab_focus(okbutton);
 
 
   if (prefs->audio_player==-1) {
@@ -392,16 +392,16 @@
     return GTK_RESPONSE_CANCEL;
   }
 
-  gtk_widget_show_all(dialog);
+  lives_widget_show_all(dialog);
 
-  response=gtk_dialog_run(GTK_DIALOG(dialog));
+  response=lives_dialog_run(GTK_DIALOG(dialog));
 
-  gtk_widget_destroy(dialog);
+  lives_widget_destroy(dialog);
 
   if (prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_MPLAYER) {
-    gtk_widget_hide(mainw->vol_toolitem);
-    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
-    gtk_widget_hide (mainw->recaudio_submenu);
+    lives_widget_hide(mainw->vol_toolitem);
+    if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
+    lives_widget_hide (mainw->recaudio_submenu);
   }
 
   lives_widget_context_update();
@@ -413,19 +413,19 @@
 static void add_test(GtkWidget *table, gint row, gchar *ttext, boolean noskip) {
   GtkWidget *label=lives_standard_label_new(ttext);
 
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
-  gtk_widget_show(label);
+  lives_table_attach (GTK_TABLE (table), label, 0, 1, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
+  lives_widget_show(label);
 
   if (!noskip) {
     GtkWidget *image=lives_image_new_from_stock(GTK_STOCK_REMOVE,LIVES_ICON_SIZE_LARGE_TOOLBAR);
     // TRANSLATORS - as in "skipped test"
     label=lives_standard_label_new(_("Skipped"));
 
-    gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
-    gtk_widget_show(label);
+    lives_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
+    lives_widget_show(label);
 
-    gtk_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
-    gtk_widget_show(image);
+    lives_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
+    lives_widget_show(image);
   }
 
   lives_widget_context_update();
@@ -437,11 +437,11 @@
   GtkWidget *label=lives_standard_label_new(_("Passed"));
   GtkWidget *image=lives_image_new_from_stock(GTK_STOCK_APPLY,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 
-  gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
-  gtk_widget_show(label);
+  lives_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
+  lives_widget_show(label);
 
-  gtk_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
-  gtk_widget_show(image);
+  lives_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
+  lives_widget_show(image);
 
   lives_widget_context_update();
   return TRUE;
@@ -454,17 +454,17 @@
 
   label=lives_standard_label_new(ftext);
 
-  gtk_table_attach (GTK_TABLE (table), label, 3, 4, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
-  gtk_widget_show(label);
+  lives_table_attach (GTK_TABLE (table), label, 3, 4, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
+  lives_widget_show(label);
   
   // TRANSLATORS - as in "failed test"
   label=lives_standard_label_new(_("Failed"));
 
-  gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
-  gtk_widget_show(label);
+  lives_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
+  lives_widget_show(label);
 
-  gtk_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
-  gtk_widget_show(image);
+  lives_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
+  lives_widget_show(image);
 
   lives_widget_context_update();
   
@@ -525,7 +525,7 @@
 
   dialog = lives_standard_dialog_new (title,FALSE);
 
-  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  accel_group = GTK_ACCEL_GROUP(lives_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
   g_free(title);

LiVES-2.0.3.tar.bz2/src/stream.c -> LiVES-2.0.4.tar.bz2/src/stream.c Changed

@@ -432,12 +432,12 @@
   pthread_attr_t pattr;
 #endif
 
-  gtk_widget_set_sensitive (mainw->open_lives2lives, FALSE);
+  lives_widget_set_sensitive (mainw->open_lives2lives, FALSE);
 
   lstream->handle=OpenHTMSocket(host,port,FALSE);
   if (lstream->handle==NULL) {
     do_error_dialog(_("LiVES to LiVES stream error: Could not open port !\n"));
-    gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -456,7 +456,7 @@
   if (pthread_attr_setstacksize(&pattr,STREAM_BUF_SIZE*4)) {
     do_error_dialog(_("LiVES to LiVES stream error: Could not set buffer size !\n"));
     g_free(lstream);
-    gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
     return;
   }
   lstream->buffer=g_malloc(STREAM_BUF_SIZE);
@@ -478,7 +478,7 @@
 #endif
     g_free(lstream);
     d_print_cancelled();
-    gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -498,7 +498,7 @@
 #endif
 	g_free(lstream);
 	d_print_cancelled();
-	gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
 	return;
       }
       // get packet header
@@ -515,7 +515,7 @@
 #endif
 	g_free(lstream);
 	d_print_cancelled();
-	gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
 	return;
       }
     } while (hdr==NULL);
@@ -541,7 +541,7 @@
 #endif
 	g_free(lstream);
 	d_print_cancelled();
-	gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
 	return;
       }
     }
@@ -565,7 +565,7 @@
 #endif
     g_free(lstream);
     d_print_failed();
-    gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -585,7 +585,7 @@
 #endif
     g_free(lstream);
     d_print_failed();
-    gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -671,7 +671,7 @@
   cfile->ext_src=NULL;
 
   close_current_file(old_file);
-  gtk_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+  lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
 }
 
 
@@ -1017,7 +1017,7 @@
     g_snprintf(future_prefs->vpp_name,64,"lives2lives_stream");
   }
   vppa=on_vpp_advanced_clicked(NULL,NULL);
-  resp=gtk_dialog_run(GTK_DIALOG(vppa->dialog));
+  resp=lives_dialog_run(GTK_DIALOG(vppa->dialog));
 
   if (resp==GTK_RESPONSE_CANCEL) {
     g_free(orig_name);
@@ -1042,19 +1042,19 @@
   gint port=0;
 
   lives_pandh_w *pandh=create_pandh_dialog(0);
-  gint response=gtk_dialog_run (GTK_DIALOG (pandh->dialog));
+  gint response=lives_dialog_run (GTK_DIALOG (pandh->dialog));
 
   if (response==GTK_RESPONSE_OK) {
     if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(pandh->rb_anyhost))) {
-      host=g_strdup_printf("%s.%s.%s.%s",gtk_entry_get_text(GTK_ENTRY(pandh->entry1)),
-			   gtk_entry_get_text(GTK_ENTRY(pandh->entry2)),
-			   gtk_entry_get_text(GTK_ENTRY(pandh->entry3)),gtk_entry_get_text(GTK_ENTRY(pandh->entry4)));
+      host=g_strdup_printf("%s.%s.%s.%s",lives_entry_get_text(GTK_ENTRY(pandh->entry1)),
+			   lives_entry_get_text(GTK_ENTRY(pandh->entry2)),
+			   lives_entry_get_text(GTK_ENTRY(pandh->entry3)),gtk_entry_get_text(GTK_ENTRY(pandh->entry4)));
     }
     else host=g_strdup("INADDR_ANY");
-    port=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pandh->port_spin));
+    port=lives_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pandh->port_spin));
   }
 
-  gtk_widget_destroy (pandh->dialog);
+  lives_widget_destroy (pandh->dialog);
   g_free(pandh);
   
   lives_widget_context_update();
@@ -1074,16 +1074,16 @@
   lives_pandh_w *pandhw=(lives_pandh_w *)user_data;
 
   if (lives_toggle_button_get_active(tbut)) {
-    gtk_widget_set_sensitive(pandhw->entry1,FALSE);
-    gtk_widget_set_sensitive(pandhw->entry2,FALSE);
-    gtk_widget_set_sensitive(pandhw->entry3,FALSE);
-    gtk_widget_set_sensitive(pandhw->entry4,FALSE);
+    lives_widget_set_sensitive(pandhw->entry1,FALSE);
+    lives_widget_set_sensitive(pandhw->entry2,FALSE);
+    lives_widget_set_sensitive(pandhw->entry3,FALSE);
+    lives_widget_set_sensitive(pandhw->entry4,FALSE);
   }
   else {
-    gtk_widget_set_sensitive(pandhw->entry1,TRUE);
-    gtk_widget_set_sensitive(pandhw->entry2,TRUE);
-    gtk_widget_set_sensitive(pandhw->entry3,TRUE);
-    gtk_widget_set_sensitive(pandhw->entry4,TRUE);
+    lives_widget_set_sensitive(pandhw->entry1,TRUE);
+    lives_widget_set_sensitive(pandhw->entry2,TRUE);
+    lives_widget_set_sensitive(pandhw->entry3,TRUE);
+    lives_widget_set_sensitive(pandhw->entry4,TRUE);
   }
 }
 
@@ -1111,18 +1111,18 @@
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(pandhw->dialog));
 
   label=lives_standard_label_new(_("You can receive streams from another copy of LiVES."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   label=lives_standard_label_new(_("In the source copy of LiVES, you must select Advanced/Send stream to LiVES\nor select the lives2lives_stream playback plugin in Preferences."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
   label=lives_standard_label_new(_("Select the host to receive the stream from (or allow any host to stream)."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   pandhw->rb_anyhost = lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams from _any host")))
 							,TRUE,radiobutton_group,LIVES_BOX(hbox),
@@ -1136,7 +1136,7 @@
 			  (gpointer)pandhw);
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
 
   lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams only from the _specified host:")))
@@ -1149,27 +1149,27 @@
 
 
   hbox = lives_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   pandhw->entry1 = lives_standard_entry_new ("",FALSE,"127",3,3,LIVES_BOX(hbox),NULL);
   pandhw->entry2 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
   pandhw->entry3 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
   pandhw->entry4 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
 
-  gtk_widget_set_sensitive(pandhw->entry1,FALSE);
-  gtk_widget_set_sensitive(pandhw->entry2,FALSE);
-  gtk_widget_set_sensitive(pandhw->entry3,FALSE);
-  gtk_widget_set_sensitive(pandhw->entry4,FALSE);
+  lives_widget_set_sensitive(pandhw->entry1,FALSE);
+  lives_widget_set_sensitive(pandhw->entry2,FALSE);
+  lives_widget_set_sensitive(pandhw->entry3,FALSE);
+  lives_widget_set_sensitive(pandhw->entry4,FALSE);

LiVES-2.0.3.tar.bz2/src/utils.c -> LiVES-2.0.4.tar.bz2/src/utils.c Changed

@@ -1737,8 +1737,8 @@
     break;
   }
 
-  gtk_widget_set_sensitive (mainw->show_layout_errors, TRUE);
-  if (mainw->multitrack!=NULL) gtk_widget_set_sensitive (mainw->multitrack->show_layout_errors, TRUE);
+  lives_widget_set_sensitive (mainw->show_layout_errors, TRUE);
+  if (mainw->multitrack!=NULL) lives_widget_set_sensitive (mainw->multitrack->show_layout_errors, TRUE);
   return TRUE;
 }
 
@@ -1760,8 +1760,8 @@
   g_list_free(lmap);
 
   mainw->affected_layouts_map=NULL;
-  gtk_widget_set_sensitive (mainw->show_layout_errors, FALSE);
-  if (mainw->multitrack!=NULL) gtk_widget_set_sensitive (mainw->multitrack->show_layout_errors, FALSE);
+  lives_widget_set_sensitive (mainw->show_layout_errors, FALSE);
+  if (mainw->multitrack!=NULL) lives_widget_set_sensitive (mainw->multitrack->show_layout_errors, FALSE);
 
   if (mainw->affected_layout_marks!=NULL) {
     remove_current_from_affected_layouts(mainw->multitrack);
@@ -2534,7 +2534,7 @@
 
       }
       lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
-      gtk_widget_queue_draw (mainw->hruler);
+      lives_widget_queue_draw (mainw->hruler);
     }
     if (cfile->achans>0&&cfile->is_loaded&&prefs->audio_src!=AUDIO_SRC_EXT) {
       if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&
@@ -2622,7 +2622,7 @@
     }
     if (cfile->frames==0) {
       lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
-      gtk_widget_queue_draw (mainw->hruler);
+      lives_widget_queue_draw (mainw->hruler);
     }
   }
   
@@ -2630,15 +2630,15 @@
     if (cfile->total_time>0.) {
       // set the range of the timeline
       if (!cfile->opening_loc) {
-	gtk_widget_show (mainw->hruler);
+	lives_widget_show (mainw->hruler);
       }
-      gtk_widget_show (mainw->eventbox5);
-      gtk_widget_show (mainw->video_draw);
-      gtk_widget_show (mainw->laudio_draw);
-      gtk_widget_show (mainw->raudio_draw);
+      lives_widget_show (mainw->eventbox5);
+      lives_widget_show (mainw->video_draw);
+      lives_widget_show (mainw->laudio_draw);
+      lives_widget_show (mainw->raudio_draw);
 
       lives_ruler_set_upper(LIVES_RULER (mainw->hruler),cfile->total_time);
-      gtk_widget_queue_draw(mainw->hruler);
+      lives_widget_queue_draw(mainw->hruler);
 
       draw_little_bars(cfile->pointer_time);
 
@@ -2650,17 +2650,17 @@
 	// and add it the play window
 	if (lives_widget_get_parent(mainw->preview_box)==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
 					       cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
-	  gtk_widget_queue_draw(mainw->play_window);
-	  gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
-	  gtk_widget_grab_focus (mainw->preview_spinbutton);
+	  lives_widget_queue_draw(mainw->play_window);
+	  lives_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+	  lives_widget_grab_focus (mainw->preview_spinbutton);
 	  play_window_set_title();
 	  load_preview_image(FALSE);
 	}
       }
     }
     else {
-      gtk_widget_hide (mainw->hruler);
-      gtk_widget_hide (mainw->eventbox5);
+      lives_widget_hide (mainw->hruler);
+      lives_widget_hide (mainw->eventbox5);
     }
 
     if (cfile->opening_loc||(cfile->frames==123456789&&cfile->opening)) {
@@ -2679,7 +2679,7 @@
 	}
       }
     }
-    gtk_label_set_text(GTK_LABEL(mainw->vidbar),tmpstr);
+    lives_label_set_text(GTK_LABEL(mainw->vidbar),tmpstr);
     g_free(tmpstr);
     if (cfile->achans==0) {
       tmpstr=g_strdup (_ ("(No audio)"));
@@ -2702,7 +2702,7 @@
 	}
       }
     }
-    gtk_label_set_text(GTK_LABEL(mainw->laudbar),tmpstr);
+    lives_label_set_text(GTK_LABEL(mainw->laudbar),tmpstr);
     g_free(tmpstr);
     if (cfile->achans>1) {
       if (cfile->opening_audio) {
@@ -2711,12 +2711,12 @@
       else {
 	tmpstr=g_strdup_printf(_ ("Right Audio [%.2f sec]"),cfile->raudio_time);
       }
-      gtk_label_set_text(GTK_LABEL(mainw->raudbar),tmpstr);
-      gtk_widget_show (mainw->raudbar);
+      lives_label_set_text(GTK_LABEL(mainw->raudbar),tmpstr);
+      lives_widget_show (mainw->raudbar);
       g_free(tmpstr);
     }
     else {
-      gtk_widget_hide (mainw->raudbar);
+      lives_widget_hide (mainw->raudbar);
     }
   }
   else {
@@ -2726,12 +2726,12 @@
   }
 
   if (!mainw->draw_blocked) {
-    gtk_widget_queue_draw(mainw->video_draw);
-    gtk_widget_queue_draw(mainw->laudio_draw);
-    gtk_widget_queue_draw(mainw->raudio_draw);
+    lives_widget_queue_draw(mainw->video_draw);
+    lives_widget_queue_draw(mainw->laudio_draw);
+    lives_widget_queue_draw(mainw->raudio_draw);
   }
-  gtk_widget_queue_draw(mainw->vidbar);
-  gtk_widget_queue_draw(mainw->hruler);
+  lives_widget_queue_draw(mainw->vidbar);
+  lives_widget_queue_draw(mainw->hruler);
 }
     
 
@@ -2979,12 +2979,12 @@
 
 void zero_spinbuttons (void) {
   g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
-  gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.,0.);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.);
+  lives_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.,0.);
+  lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.);
   g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
   g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func);
-  gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_end),0.,0.);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),0.);
+  lives_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_end),0.,0.);
+  lives_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),0.);
   g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
 }
 
@@ -3010,9 +3010,9 @@
       jack_driver_activate(mainw->jackd);
     }
     mainw->aplayer_broken=FALSE;
-    gtk_widget_show(mainw->vol_toolitem);
-    if (mainw->vol_label!=NULL) gtk_widget_show(mainw->vol_label);
-    gtk_widget_show (mainw->recaudio_submenu);
+    lives_widget_show(mainw->vol_toolitem);
+    if (mainw->vol_label!=NULL) lives_widget_show(mainw->vol_label);
+    lives_widget_show (mainw->recaudio_submenu);
 
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
@@ -3060,9 +3060,9 @@
 	pulse_driver_activate(mainw->pulsed);
       }
       mainw->aplayer_broken=FALSE;
-      gtk_widget_show(mainw->vol_toolitem);
-      if (mainw->vol_label!=NULL) gtk_widget_show(mainw->vol_label);
-      gtk_widget_show (mainw->recaudio_submenu);
+      lives_widget_show(mainw->vol_toolitem);
+      if (mainw->vol_label!=NULL) lives_widget_show(mainw->vol_label);
+      lives_widget_show (mainw->recaudio_submenu);
 
       prefs->audio_player=AUD_PLAYER_PULSE;
       set_pref("audio_player","pulse");
@@ -3100,9 +3100,9 @@
   g_snprintf(prefs->aplayer,512,"%s","sox");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
-    gtk_widget_hide(mainw->vol_toolitem);
-    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
-    gtk_widget_hide (mainw->recaudio_submenu);
+    lives_widget_hide(mainw->vol_toolitem);
+    if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
+    lives_widget_hide (mainw->recaudio_submenu);
     
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
@@ -3154,9 +3154,9 @@
   g_snprintf(prefs->aplayer,512,"%s","mplayer");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
-    gtk_widget_hide(mainw->vol_toolitem);
-    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
-    gtk_widget_hide (mainw->recaudio_submenu);

LiVES-2.0.3.tar.bz2/src/videodev.c -> LiVES-2.0.4.tar.bz2/src/videodev.c Changed

LiVES-2.0.3.tar.bz2/src/widget-helper.c -> LiVES-2.0.4.tar.bz2/src/widget-helper.c Changed

@@ -294,11 +294,11 @@
 #ifdef GUI_GTK
 static void set_label_state(GtkWidget *widget, LiVESWidgetState state, gpointer labelp) {
   GtkWidget *label=(GtkWidget *)labelp;
-  if (gtk_widget_get_sensitive(widget)&&!gtk_widget_get_sensitive(label)) {
-    gtk_widget_set_sensitive(label,TRUE);
+  if (lives_widget_get_sensitive(widget)&&!lives_widget_get_sensitive(label)) {
+    lives_widget_set_sensitive(label,TRUE);
   }
-  if (!gtk_widget_get_sensitive(widget)&&gtk_widget_get_sensitive(label)) {
-    gtk_widget_set_sensitive(label,FALSE);
+  if (!lives_widget_get_sensitive(widget)&&lives_widget_get_sensitive(label)) {
+    lives_widget_set_sensitive(label,FALSE);
   }
 }
 #endif
@@ -310,6 +310,84 @@
 }
 
 
+LIVES_INLINE void lives_widget_set_sensitive(LiVESWidget *widget, boolean state) {
+#ifdef GUI_GTK
+  gtk_widget_set_sensitive(widget,state);
+#endif
+}
+
+
+LIVES_INLINE boolean lives_widget_get_sensitive(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  return gtk_widget_get_sensitive(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_show(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_show(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_hide(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_hide(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_show_all(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_show_all(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_destroy(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_destroy(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_queue_draw(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_queue_draw(widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_queue_draw_area(LiVESWidget *widget, int x, int y, int width, int height) {
+#ifdef GUI_GTK
+  gtk_widget_queue_draw_area(widget,x,y,width,height);
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_queue_resize(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_widget_queue_resize(widget);
+#endif
+}
+
+
+
+LIVES_INLINE void lives_widget_set_size_request(LiVESWidget *widget, int width, int height) {
+#ifdef GUI_GTK
+  gtk_widget_set_size_request(widget,width,height);
+#endif
+}
+
+
+
+LIVES_INLINE int lives_dialog_run(LiVESDialog *dialog) {
+#ifdef GUI_GTK
+  return gtk_dialog_run(dialog);
+#endif
+}
+
 
 LIVES_INLINE void lives_widget_set_bg_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
 #ifdef GUI_GTK
@@ -422,6 +500,40 @@
 }
 
 
+LIVES_INLINE LiVESWidget *lives_image_new_from_file(const char *filename) {
+  LiVESWidget *image=NULL;
+#ifdef GUI_GTK
+  image=gtk_image_new_from_file(filename);
+#endif
+  return image;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_image_new_from_pixbuf(LiVESPixbuf *pixbuf) {
+  LiVESWidget *image=NULL;
+#ifdef GUI_GTK
+  image=gtk_image_new_from_pixbuf(pixbuf);
+#endif
+  return image;
+}
+
+
+
+LIVES_INLINE void lives_image_set_from_pixbuf(LiVESImage *image, LiVESPixbuf *pixbuf) {
+#ifdef GUI_GTK
+  gtk_image_set_from_pixbuf(image,pixbuf);
+#endif
+}
+
+
+LIVES_INLINE LiVESPixbuf *lives_image_get_pixbuf(LiVESImage *image) {
+  LiVESPixbuf *pixbuf=NULL;
+#ifdef GUI_GTK
+  pixbuf=gtk_image_get_pixbuf(image);
+#endif
+  return pixbuf;
+}
+
 
 
 LIVES_INLINE boolean lives_color_parse(const char *spec, LiVESWidgetColor *color) {
@@ -450,6 +562,8 @@
 #endif
 }
 
+
+
 LIVES_INLINE LiVESWidget *lives_dialog_get_action_area(LiVESDialog *dialog) {
 #ifdef GUI_GTK
 
@@ -464,6 +578,69 @@
 
 
 
+LIVES_INLINE void lives_dialog_add_action_widget(LiVESDialog *dialog, LiVESWidget *widget, int response) {
+#ifdef GUI_GTK
+  gtk_dialog_add_action_widget(dialog,widget,response);
+#endif
+}
+
+
+
+LIVES_INLINE void lives_window_set_title(LiVESWindow *window, const char *title) {
+#ifdef GUI_GTK
+  gtk_window_set_title(window,title);
+#endif
+}
+
+
+LIVES_INLINE void lives_window_move(LiVESWindow *window, int x, int y) {
+#ifdef GUI_GTK
+  gtk_window_move(window,x,y);
+#endif
+}
+
+
+LIVES_INLINE void lives_window_resize(LiVESWindow *window, int width, int height) {
+#ifdef GUI_GTK
+  gtk_window_resize(window,width,height);
+#endif
+}
+
+
+LIVES_INLINE void lives_window_present(LiVESWindow *window) {
+#ifdef GUI_GTK
+  gtk_window_present(window);
+#endif
+}
+
+
+LIVES_INLINE void lives_window_fullscreen(LiVESWindow *window) {
+#ifdef GUI_GTK
+  gtk_window_fullscreen(window);
+#endif
+}
+
+
+LIVES_INLINE void lives_window_unfullscreen(LiVESWindow *window) {
+#ifdef GUI_GTK

LiVES-2.0.3.tar.bz2/src/widget-helper.h -> LiVES-2.0.4.tar.bz2/src/widget-helper.h Changed

@@ -68,6 +68,8 @@
 
 #define return_true gtk_true
 
+typedef GObject LiVESObject;
+
 typedef GtkJustification LiVESJustification;
 
 #define LIVES_JUSTIFY_LEFT   GTK_JUSTIFY_LEFT
@@ -80,6 +82,7 @@
 #define LIVES_ORIENTATION_VERTICAL   GTK_ORIENTATION_VERTICAL
 
 typedef GdkEvent                          LiVESXEvent;
+typedef GdkEventButton                    LiVESXEventButton;
 typedef GdkDisplay                        LiVESXDisplay;
 typedef GdkScreen                         LiVESXScreen;
 typedef GdkDevice                         LiVESXDevice;
@@ -92,10 +95,10 @@
 #define LIVES_WIDGET_EVENT_EXPOSE_EVENT "draw"
 #define GTK_OBJECT(a)                     a
 #else
-typedef GtkObject                         LiVESObject;
 #define LIVES_WIDGET_EVENT_EXPOSE_EVENT "expose_event"
 #endif
 typedef GtkWidget                         LiVESWidget;
+typedef GtkWindow                         LiVESWindow;
 typedef GtkContainer                      LiVESContainer;
 typedef GtkBin                            LiVESBin;
 typedef GtkDialog                         LiVESDialog;
@@ -109,10 +112,16 @@
 typedef GtkRadioButton                    LiVESRadioButton;
 typedef GtkSpinButton                     LiVESSpinButton;
 typedef GtkLabel                          LiVESLabel;
+typedef GtkImage                          LiVESImage;
 typedef GtkFileChooser                    LiVESFileChooser;
+typedef GtkMenu                           LiVESMenu;
+typedef GtkMenuItem                       LiVESMenuItem;
+typedef GtkCheckMenuItem                  LiVESCheckMenuItem;
 typedef GtkImageMenuItem                  LiVESImageMenuItem;
 typedef GtkTreeView                       LiVESTreeView;
 typedef GtkTreeModel                      LiVESTreeModel;
+typedef GtkTreeIter                       LiVESTreeIter;
+typedef GtkTable                          LiVESTable;
 
 #if GTK_CHECK_VERSION(2,14,0)
 typedef GtkScaleButton                    LiVESScaleButton;
@@ -120,6 +129,8 @@
 typedef GtkRange                          LiVESScaleButton;
 #endif
 
+typedef GClosure                          LiVESWidgetClosure;
+
 
 #if GTK_CHECK_VERSION(3,0,0)
 #define LIVES_WIDGET_COLOR_HAS_ALPHA (1)
@@ -155,6 +166,13 @@
 #endif
 
 typedef enum {
+  LIVES_EXPAND=GTK_EXPAND,
+  LIVES_SHRINK=GTK_SHRINK,
+  LIVES_FILL=GTK_FILL,
+} lives_attach_options_t;
+
+
+typedef enum {
   LIVES_FILE_CHOOSER_ACTION_OPEN=GTK_FILE_CHOOSER_ACTION_OPEN,
   LIVES_FILE_CHOOSER_ACTION_SAVE=GTK_FILE_CHOOSER_ACTION_SAVE,
   LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER=GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
@@ -174,6 +192,9 @@
 } lives_icon_size_t;
 
 
+#define LIVES_ACCEL_VISIBLE GTK_ACCEL_VISIBLE
+  
+
 
 #if GTK_CHECK_VERSION(3,0,0)
 typedef GtkScale                          LiVESRuler;
@@ -203,6 +224,7 @@
 typedef GSList                            LiVESSList;
 
 typedef GtkAccelGroup                     LiVESAccelGroup;
+typedef GtkAccelFlags                     LiVESAccelFlags;
 
 typedef GdkPixbufDestroyNotify            LiVESPixbufDestroyNotify;
 
@@ -227,6 +249,7 @@
 #define LIVES_FILES_CHOOSER(widget) GTK_FILE_CHOOSER(widget)
 #define LIVES_RADIO_BUTTON(widget) GTK_RADIO_BUTTON(widget)
 #define LIVES_SPIN_BUTTON(widget) GTK_SPIN_BUTTON(widget)
+#define LIVES_MENU(widget) GTK_MENU(widget)
 #define LIVES_IMAGE_MENU_ITEM(widget) GTK_IMAGE_MENU_ITEM(widget)
 #define LIVES_FILE_CHOOSER(widget) GTK_FILE_CHOOSER(widget)
 
@@ -542,6 +565,7 @@
 					 gpointer destroy_fn_data);
 
 LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, LiVESError **error);
+LiVESWidget *lives_image_new_from_pixbuf(LiVESPixbuf *);
 LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, boolean preserve_aspect_ratio,
 						 LiVESError **error);
 
@@ -551,6 +575,21 @@
 
 // basic widget fns
 
+void lives_widget_set_sensitive(LiVESWidget *, boolean state);
+boolean lives_widget_get_sensitive(LiVESWidget *);
+
+void lives_widget_show(LiVESWidget *);
+void lives_widget_show_all(LiVESWidget *);
+void lives_widget_hide(LiVESWidget *);
+void lives_widget_destroy(LiVESWidget *);
+
+void lives_widget_queue_draw(LiVESWidget *);
+void lives_widget_queue_draw_area(LiVESWidget *, int x, int y, int width, int height);
+void lives_widget_queue_resize(LiVESWidget *);
+void lives_widget_set_size_request(LiVESWidget *, int width, int height);
+
+int lives_dialog_run(LiVESDialog *);
+
 void lives_widget_set_bg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
 void lives_widget_set_fg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
 void lives_widget_set_text_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
@@ -563,17 +602,35 @@
 
 LiVESWidgetColor *lives_widget_color_copy(LiVESWidgetColor *c1orNULL, const LiVESWidgetColor *c2);
 
+LiVESWidget *lives_image_new_from_file(const char *filename);
 LiVESWidget *lives_image_new_from_stock(const char *stock_id, lives_icon_size_t size);
 
+void lives_image_set_from_pixbuf(LiVESImage *, LiVESPixbuf *);
+LiVESPixbuf *lives_image_get_pixbuf(LiVESImage *);
+
 LiVESWidget *lives_dialog_get_content_area(LiVESDialog *);
 LiVESWidget *lives_dialog_get_action_area(LiVESDialog *);
 
+void lives_dialog_add_action_widget(LiVESDialog *, LiVESWidget *, int response_id);
+
+void lives_window_set_title(LiVESWindow *, const char *title);
+void lives_window_move(LiVESWindow *, int x, int y);
+void lives_window_resize(LiVESWindow *, int width, int height);
+void lives_window_present(LiVESWindow *);
+void lives_window_fullscreen(LiVESWindow *);
+void lives_window_unfullscreen(LiVESWindow *);
+void lives_window_maximize(LiVESWindow *);
+void lives_window_unmaximize(LiVESWindow *);
+
 LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper, 
 						   double step_increment, double page_increment, double page_size);
 
 void lives_box_set_homogeneous(LiVESBox *, boolean homogeneous);
 void lives_box_set_spacing(LiVESBox *, int spacing);
 
+void lives_box_pack_start(LiVESBox *, LiVESWidget *child, boolean expand, boolean fill, uint32_t padding);
+void lives_box_pack_end(LiVESBox *, LiVESWidget *child, boolean expand, boolean fill, uint32_t padding);
+
 LiVESWidget *lives_hbox_new(boolean homogeneous, int spacing);
 LiVESWidget *lives_vbox_new(boolean homogeneous, int spacing);
 
@@ -593,14 +650,17 @@
 LiVESWidget *lives_vscrollbar_new(LiVESAdjustment *);
 
 LiVESWidget *lives_combo_new(void);
-LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *model);
+LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *);
+LiVESTreeModel *lives_combo_get_model(LiVESCombo *);
 
 void lives_combo_append_text(LiVESCombo *, const char *text);
 void lives_combo_set_entry_text_column(LiVESCombo *, int column);
 
 char *lives_combo_get_active_text(LiVESCombo *) WARN_UNUSED;
 void lives_combo_set_active_text(LiVESCombo *, const char *text);
-
+void lives_combo_set_active_index(LiVESCombo *, int index);
+boolean lives_combo_get_active_iter(LiVESCombo *, LiVESTreeIter *);
+void lives_combo_set_active_iter(LiVESCombo *, LiVESTreeIter *);
 void lives_combo_set_active_string(LiVESCombo *, const char *active_str);
 
 LiVESWidget *lives_combo_get_entry(LiVESCombo *);
@@ -610,11 +670,18 @@
 boolean lives_toggle_button_get_active(LiVESToggleButton *);
 void lives_toggle_button_set_active(LiVESToggleButton *, boolean active);
 
+
+LiVESWidget *lives_button_new_with_mnemonic(const char *label);
+
+void lives_button_set_label(LiVESButton *, const char *label);
+
+
 void lives_tooltips_set (LiVESWidget *, const char *tip_text);
 
 LiVESSList *lives_radio_button_get_group(LiVESRadioButton *);
 
 LiVESWidget *lives_widget_get_parent(LiVESWidget *);
+LiVESWidget *lives_widget_get_toplevel(LiVESWidget *);
 
 LiVESXWindow *lives_widget_get_xwindow(LiVESWidget *);