gimp-gap r803 - in trunk: . gap vid_common vid_enc_avi vid_enc_ffmpeg
- From: wolfgangh svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp-gap r803 - in trunk: . gap vid_common vid_enc_avi vid_enc_ffmpeg
- Date: Tue, 20 Jan 2009 16:47:26 +0000 (UTC)
Author: wolfgangh
Date: Tue Jan 20 16:47:26 2009
New Revision: 803
URL: http://svn.gnome.org/viewvc/gimp-gap?rev=803&view=rev
Log:
fixed Gtk pagesize 0 warnings and colorcurves wrapper.
Modified:
trunk/ChangeLog
trunk/gap/gap_morph_dialog.c
trunk/gap/gap_onion_dialog.c
trunk/gap/gap_player_dialog.c
trunk/gap/gap_resi_dialog.c
trunk/gap/gap_story_att_trans_dlg.c
trunk/gap/gap_story_dialog.c
trunk/gap/gap_vex_dialog.c
trunk/gap/gap_wr_color_curve.c
trunk/gap/gap_wr_color_huesat.c
trunk/gap/gap_wr_color_levels.c
trunk/vid_common/gap_cme_gui.c
trunk/vid_enc_avi/gap_enc_avi_gui.c
trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
Modified: trunk/gap/gap_morph_dialog.c
==============================================================================
--- trunk/gap/gap_morph_dialog.c (original)
+++ trunk/gap/gap_morph_dialog.c Tue Jan 20 16:47:26 2009
@@ -503,7 +503,7 @@
}
gimp_pixel_fetcher_destroy (src_pixfet);
gimp_pixel_fetcher_destroy (dst_pixfet);
-
+
gimp_drawable_detach(src_drawable);
gimp_drawable_detach(dst_drawable);
@@ -1892,10 +1892,10 @@
,height
);
g_free(buf_ptr);
-
+
gimp_drawable_detach(dst_drawable);
gimp_drawable_detach(src_drawable);
-
+
}
/* render the preview (this includes scaling to preview size) */
@@ -3703,7 +3703,7 @@
adj = gtk_adjustment_new ( mgup->mgpp->gravity_intensity
, 1
, 5
- , .1, 1, 1);
+ , .1, 1, 0);
mgup->gravity_intensity_spinbutton_adj = adj;
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
mgup->gravity_intensity_spinbutton = spinbutton;
Modified: trunk/gap/gap_onion_dialog.c
==============================================================================
--- trunk/gap/gap_onion_dialog.c (original)
+++ trunk/gap/gap_onion_dialog.c Tue Jan 20 16:47:26 2009
@@ -931,7 +931,7 @@
99999.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
@@ -949,7 +949,7 @@
99999.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
@@ -1028,7 +1028,7 @@
20.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
@@ -1067,7 +1067,7 @@
100.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
@@ -1104,7 +1104,7 @@
500.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
@@ -1140,7 +1140,7 @@
100.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
1 /* digits */
);
@@ -1158,7 +1158,7 @@
100.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
1 /* digits */
);
@@ -1197,7 +1197,7 @@
100.0, /* umax */
1.0, /* sstep */
10.0, /* pagestep */
- 10.0, /* page_size */
+ 0.0, /* page_size */
1.0, /* climb_rate */
0 /* digits */
);
Modified: trunk/gap/gap_player_dialog.c
==============================================================================
--- trunk/gap/gap_player_dialog.c (original)
+++ trunk/gap/gap_player_dialog.c Tue Jan 20 16:47:26 2009
@@ -116,21 +116,21 @@
#include "gap-intl.h"
extern int gap_debug; /* 1 == print debug infos , 0 dont print debug infos */
-int cmdopt_x = 0; /* Debug option flag for wavplay */
+int cmdopt_x = 0; /* Debug option flag for wavplay */
#ifdef GAP_ENABLE_AUDIO_SUPPORT
#include "wpc_lib.h" /* headerfile for libwavplayclient (preferred) */
-char *env_WAVPLAYPATH = WAVPLAYPATH; /* Default pathname of executable /usr/local/bin/wavplay */
-char *env_AUDIODEV = AUDIODEV; /* Default compiled in audio device */
-unsigned long env_AUDIOLCK = AUDIOLCK; /* Default compiled in locking semaphore */
+char *env_WAVPLAYPATH = WAVPLAYPATH; /* Default pathname of executable /usr/local/bin/wavplay */
+char *env_AUDIODEV = AUDIODEV; /* Default compiled in audio device */
+unsigned long env_AUDIOLCK = AUDIOLCK; /* Default compiled in locking semaphore */
#else
-char *env_WAVPLAYPATH = NULL; /* Default pathname of executable /usr/local/bin/wavplay */
-char *env_AUDIODEV = NULL; /* Default compiled in audio device */
-unsigned long env_AUDIOLCK = 0; /* Default compiled in locking semaphore */
+char *env_WAVPLAYPATH = NULL; /* Default pathname of executable /usr/local/bin/wavplay */
+char *env_AUDIODEV = NULL; /* Default compiled in audio device */
+unsigned long env_AUDIOLCK = 0; /* Default compiled in locking semaphore */
#endif
#ifdef GAP_ENABLE_VIDEOAPI_SUPPORT
@@ -330,21 +330,21 @@
static void p_close_videofile(GapPlayerMainGlobalParams *gpp);
static void p_open_videofile(GapPlayerMainGlobalParams *gpp
, char *filename
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- );
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ );
static guchar * p_fetch_videoframe(GapPlayerMainGlobalParams *gpp
, char *gva_videofile
- , gint32 framenumber
- , gint32 rangesize
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- , gint32 *th_bpp
- , gint32 *th_width
- , gint32 *th_height
- );
+ , gint32 framenumber
+ , gint32 rangesize
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ , gint32 *th_bpp
+ , gint32 *th_width
+ , gint32 *th_height
+ );
static void p_init_video_playback_cache(GapPlayerMainGlobalParams *gpp);
static void p_init_layout_options(GapPlayerMainGlobalParams *gpp);
static guchar * p_fetch_frame_via_cache(GapPlayerMainGlobalParams *gpp
@@ -399,7 +399,7 @@
{
char buf[1024];
- vsnprintf(buf,sizeof(buf),format,ap); /* Format the message */
+ vsnprintf(buf,sizeof(buf),format,ap); /* Format the message */
g_message(_("Problem with audioplayback. The audiolib reported:\n%s"),buf);
} /* end p_audio_errfunc */
@@ -566,10 +566,10 @@
{
if ( apcl_start(p_audio_errfunc) < 0 )
{
- g_message(_("Failure to start the wavplay server is fatal.\n"
- "Please check the executability of the 'wavplay' command.\n"
- "If you have installed the wavplay executeable somewhere\n"
- "you can set the Environmentvariable WAVPLAYPATH before gimp startup\n"));
+ g_message(_("Failure to start the wavplay server is fatal.\n"
+ "Please check the executability of the 'wavplay' command.\n"
+ "If you have installed the wavplay executeable somewhere\n"
+ "you can set the Environmentvariable WAVPLAYPATH before gimp startup\n"));
}
else
{
@@ -584,7 +584,7 @@
if(gpp->audio_status < GAP_PLAYER_MAIN_AUSTAT_FILENAME_SET)
{
- apcl_path(gpp->audio_filename,0,p_audio_errfunc); /* Tell server the new path */
+ apcl_path(gpp->audio_filename,0,p_audio_errfunc); /* Tell server the new path */
gpp->audio_status = GAP_PLAYER_MAIN_AUSTAT_FILENAME_SET;
}
}
@@ -659,11 +659,11 @@
g_snprintf(txt_buf, sizeof(txt_buf), _("%d (at %.4f frames/sec)")
, (int)gap_timeconv_samples_to_frames(l_samples
- ,(gdouble)l_samplerate
- ,(gdouble)gpp->original_speed /* framerate */
- )
- , (float)gpp->original_speed
- );
+ ,(gdouble)l_samplerate
+ ,(gdouble)gpp->original_speed /* framerate */
+ )
+ , (float)gpp->original_speed
+ );
gtk_label_set_text ( GTK_LABEL(gpp->audio_total_frames_label), txt_buf);
g_snprintf(txt_buf, sizeof(txt_buf), "%d", (int)l_samples );
@@ -723,11 +723,11 @@
#ifdef GAP_ENABLE_AUDIO_SUPPORT
int fd;
int rc;
- int channels; /* Channels recorded in this wav file */
- u_long samplerate; /* Sampling rate */
- int sample_bits; /* data bit size (8/12/16) */
- u_long samples; /* The number of samples in this file */
- u_long datastart; /* The offset to the wav data */
+ int channels; /* Channels recorded in this wav file */
+ u_long samplerate; /* Sampling rate */
+ int sample_bits; /* data bit size (8/12/16) */
+ u_long samples; /* The number of samples in this file */
+ u_long datastart; /* The offset to the wav data */
if (gap_debug)
{
@@ -745,11 +745,11 @@
rc = WaveReadHeader(fd
,&channels
- ,&samplerate
- ,&sample_bits
- ,&samples
- ,&datastart
- ,p_audio_errfunc);
+ ,&samplerate
+ ,&sample_bits
+ ,&samples
+ ,&datastart
+ ,p_audio_errfunc);
close(fd);
if(rc != 0)
@@ -1095,7 +1095,7 @@
/* check gimprc for the wavplay audio server: */
if ( (cp = gimp_gimprc_query("wavplay_prog")) != NULL )
{
- env_WAVPLAYPATH = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
+ env_WAVPLAYPATH = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
if(g_file_test (env_WAVPLAYPATH, G_FILE_TEST_IS_EXECUTABLE) )
{
wavplay_server_found = TRUE;
@@ -1104,10 +1104,10 @@
{
g_message(_("WARNING: your gimprc file configuration for the wavplay audio server\n"
"does not point to an executable program\n"
- "the configured value for %s is: %s\n")
- , "wavplay_prog"
- , env_WAVPLAYPATH
- );
+ "the configured value for %s is: %s\n")
+ , "wavplay_prog"
+ , env_WAVPLAYPATH
+ );
}
}
@@ -1116,19 +1116,19 @@
{
if ( (cp = g_getenv("WAVPLAYPATH")) != NULL )
{
- env_WAVPLAYPATH = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
+ env_WAVPLAYPATH = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
if(g_file_test (env_WAVPLAYPATH, G_FILE_TEST_IS_EXECUTABLE) )
{
- wavplay_server_found = TRUE;
+ wavplay_server_found = TRUE;
}
else
{
- g_message(_("WARNING: the environment variable %s\n"
+ g_message(_("WARNING: the environment variable %s\n"
"does not point to an executable program\n"
- "the current value is: %s\n")
- , "WAVPLAYPATH"
- , env_WAVPLAYPATH
- );
+ "the current value is: %s\n")
+ , "WAVPLAYPATH"
+ , env_WAVPLAYPATH
+ );
}
}
}
@@ -1146,10 +1146,10 @@
}
if ( (cp = g_getenv("AUDIODEV")) != NULL )
- env_AUDIODEV = g_strdup(cp); /* Environment overrides compiled in default for AUDIODEV */
+ env_AUDIODEV = g_strdup(cp); /* Environment overrides compiled in default for AUDIODEV */
if ( (cp = g_getenv("AUDIOLCK")) == NULL || sscanf(cp,"%lX",&env_AUDIOLCK) != 1 )
- env_AUDIOLCK = AUDIOLCK; /* Use compiled in default, if no environment, or its bad */
+ env_AUDIOLCK = AUDIOLCK; /* Use compiled in default, if no environment, or its bad */
if(wavplay_server_found)
{
@@ -1162,13 +1162,13 @@
g_message(_("No audiosupport available\n"
"the audioserver executable file '%s' was not found.\n"
"If you have installed '%s'\n"
- "you should add the installation dir to your PATH\n"
- "or set environment variable %s to the name of the executable\n"
- "before you start GIMP")
- , "wavplay"
- , "wavplay 1.4"
- , "WAVPLAYPATH"
- );
+ "you should add the installation dir to your PATH\n"
+ "or set environment variable %s to the name of the executable\n"
+ "before you start GIMP")
+ , "wavplay"
+ , "wavplay 1.4"
+ , "WAVPLAYPATH"
+ );
}
#endif
return;
@@ -1342,8 +1342,8 @@
l_name = g_strdup_printf("frame_%06d (%dms)"
,(int)gpp->play_current_framenr
- ,(int)(1000 / gpp->speed)
- );
+ ,(int)(1000 / gpp->speed)
+ );
gimp_drawable_set_name(dst_layer_id, l_name);
g_free(l_name);
}
@@ -1411,8 +1411,8 @@
l_name = g_strdup_printf("thumb_%06d (%dms)"
,(int)gpp->play_current_framenr
- ,(int)(1000 / gpp->speed)
- );
+ ,(int)(1000 / gpp->speed)
+ );
gimp_drawable_set_name(dst_layer_id, l_name);
g_free(l_name);
}
@@ -1509,21 +1509,21 @@
{
/* Storyboard command line for playback of GAP singleframe range */
printf("VID_PLAY_MOVIE 1=track \"%s\" %06d=frame_from %06d=frame_to normal 1=nloops %d=seltrack\n"
- , gpp->ainfo_ptr->old_filename
- , (int)l_begin
- , (int)l_end
- , (int)gpp->ainfo_ptr->seltrack
- );
+ , gpp->ainfo_ptr->old_filename
+ , (int)l_begin
+ , (int)l_end
+ , (int)gpp->ainfo_ptr->seltrack
+ );
}
else
{
/* Storyboard command line for playback of GAP singleframe range */
printf("VID_PLAY_FRAMES 1=track \"%s\" %s %06d=frame_from %06d=frame_to normal 1=nloops\n"
- , gpp->ainfo_ptr->basename
- , &gpp->ainfo_ptr->extension[1]
- , (int)l_begin
- , (int)l_end
- );
+ , gpp->ainfo_ptr->basename
+ , &gpp->ainfo_ptr->extension[1]
+ , (int)l_begin
+ , (int)l_end
+ );
}
}
@@ -1561,10 +1561,10 @@
static GapAnimInfo *
p_alloc_ainfo_for_videofile(GapPlayerMainGlobalParams *gpp
, char *filename
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- )
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ )
{
GapAnimInfo *l_ainfo_ptr;
@@ -1582,7 +1582,7 @@
{
printf ("p_alloc_ainfo_for_videofile: file %s does not exist\n"
, filename
- );
+ );
}
return (NULL);
}
@@ -1593,7 +1593,7 @@
{
printf ("p_alloc_ainfo_for_videofile: file %s has no typical video extension\n"
, filename
- );
+ );
}
if(!gpp->force_open_as_video)
{
@@ -1611,7 +1611,7 @@
{
printf ("p_alloc_ainfo_for_videofile: file %s NO compatible Decoder available\n"
, filename
- );
+ );
}
return (NULL);
}
@@ -1671,10 +1671,10 @@
{
gpp->ainfo_ptr = p_alloc_ainfo_for_videofile(gpp
,gpp->imagename
- ,gpp->seltrack
- ,gpp->delace
- ,gpp->preferred_decoder
- );
+ ,gpp->seltrack
+ ,gpp->delace
+ ,gpp->preferred_decoder
+ );
if(gpp->ainfo_ptr)
{
return;
@@ -1717,19 +1717,19 @@
if(vin_ptr)
{
if(vin_ptr->framerate > 0.0)
- {
+ {
gpp->original_speed = vin_ptr->framerate;
- }
+ }
/* check if automatic onionskin layer removal is turned on */
if((vin_ptr->auto_delete_before_save)
- && (vin_ptr->onionskin_auto_enable))
- {
- /* yes, in this case the player must show the active image
- * without onionskin layers
- */
- gpp->onion_delete = TRUE;
- }
+ && (vin_ptr->onionskin_auto_enable))
+ {
+ /* yes, in this case the player must show the active image
+ * without onionskin layers
+ */
+ gpp->onion_delete = TRUE;
+ }
}
if(vin_ptr)
{
@@ -1785,13 +1785,13 @@
GTK_ADJUSTMENT(gpp->to_spinbutton_adj)->upper = l_upper;
gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
, (gfloat) CLAMP(GTK_ADJUSTMENT(gpp->to_spinbutton_adj)->value, l_lower, l_upper)
- );
+ );
GTK_ADJUSTMENT(gpp->framenr_spinbutton_adj)->lower = l_lower;
GTK_ADJUSTMENT(gpp->framenr_spinbutton_adj)->upper = l_upper;
gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->framenr_spinbutton_adj)
, (gfloat)CLAMP(GTK_ADJUSTMENT(gpp->framenr_spinbutton_adj)->value, l_lower, l_upper)
- );
+ );
} /* end p_update_ainfo_dependent_widgets */
@@ -2044,9 +2044,9 @@
/* shortname prefix to indicate that displayed filename is from type storyboard file */
frame_title = gap_lib_shorten_filename(l_prefix /* prefix short for storyboard */
,gpp->stb_ptr->storyboardfile /* filenamepart */
- ,NULL /* suffix */
- ,MAX_CHARS
- );
+ ,NULL /* suffix */
+ ,MAX_CHARS
+ );
g_free(l_prefix);
}
else
@@ -2055,12 +2055,12 @@
{
if(gpp->ainfo_ptr->ainfo_type == GAP_AINFO_MOVIE)
{
- /* shortname prefix to indicate that displayed filename is a single videofile */
+ /* shortname prefix to indicate that displayed filename is a single videofile */
frame_title = gap_lib_shorten_filename(_("VIDEO:") /* prefix short for storyboard */
,gpp->ainfo_ptr->basename /* filenamepart */
- ,NULL /* suffix */
- ,MAX_CHARS
- );
+ ,NULL /* suffix */
+ ,MAX_CHARS
+ );
}
}
}
@@ -2070,13 +2070,13 @@
/* shortname prefix to indicate that displayed filename is basename of the frames */
frame_title = gap_lib_shorten_filename(_("FRAMES:") /* prefix short for storyboard */
,gpp->ainfo_ptr->basename /* filenamepart */
- ,NULL /* suffix */
- ,MAX_CHARS
- );
+ ,NULL /* suffix */
+ ,MAX_CHARS
+ );
}
gtk_frame_set_label (GTK_FRAME (gpp->frame_with_name)
- , frame_title);
+ , frame_title);
g_free(frame_title);
} /* end p_set_frame_with_name_label */
@@ -2457,7 +2457,7 @@
*/
g_snprintf(gpp->audio_filename, sizeof(gpp->audio_filename), "%s"
, l_audiofilename
- );
+ );
gtk_entry_set_text(GTK_ENTRY(gpp->audio_filename_entry), l_audiofilename);
p_audio_filename_changed (gpp);
@@ -2591,10 +2591,10 @@
static void
p_open_videofile(GapPlayerMainGlobalParams *gpp
, char *filename
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- )
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ )
{
#ifdef GAP_ENABLE_VIDEOAPI_SUPPORT
char *vindex_file;
@@ -2624,11 +2624,11 @@
* }
*/
gpp->gvahand = GVA_open_read_pref(filename
- , seltrack
- , 1 /* aud_track */
- , l_preferred_decoder
- , FALSE /* use MMX if available (disable_mmx == FALSE) */
- );
+ , seltrack
+ , 1 /* aud_track */
+ , l_preferred_decoder
+ , FALSE /* use MMX if available (disable_mmx == FALSE) */
+ );
/*printf("PLAYER: open gpp->gvahand:%d\n", (int)gpp->gvahand);*/
@@ -2659,8 +2659,8 @@
gpp->progress_bar_idle_txt = g_strdup(dec_elem->decoder_name);
vindex_file = GVA_build_videoindex_filename(gpp->gva_videofile
,1 /* track */
- ,dec_elem->decoder_name
- );
+ ,dec_elem->decoder_name
+ );
}
else
{
@@ -2698,46 +2698,46 @@
if(vindex_permission)
{
- /* create video index
- * (dont do that while we are in startup
- * because the shell window and progress_bar widget and many other things
- * are not set up yet and this long running operation
- * would be done without any visible sign)
- */
- gpp->cancel_video_api = FALSE;
- gpp->request_cancel_video_api = FALSE;
- if(gpp->progress_bar)
- {
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(gpp->progress_bar), _("Creating Index"));
- }
- gpp->gvahand->create_vindex = TRUE;
-
- /* while videoindex creation show cancel button and hide play/stop buttons */
- gtk_widget_hide (gpp->play_n_stop_hbox);
- gtk_widget_show (gpp->cancel_vindex_button);
+ /* create video index
+ * (dont do that while we are in startup
+ * because the shell window and progress_bar widget and many other things
+ * are not set up yet and this long running operation
+ * would be done without any visible sign)
+ */
+ gpp->cancel_video_api = FALSE;
+ gpp->request_cancel_video_api = FALSE;
+ if(gpp->progress_bar)
+ {
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(gpp->progress_bar), _("Creating Index"));
+ }
+ gpp->gvahand->create_vindex = TRUE;
+
+ /* while videoindex creation show cancel button and hide play/stop buttons */
+ gtk_widget_hide (gpp->play_n_stop_hbox);
+ gtk_widget_show (gpp->cancel_vindex_button);
/* printf("PLAYER: open before GVA_count_frames\n"); */
- gpp->vindex_creation_is_running = TRUE;
- GVA_count_frames(gpp->gvahand);
- gpp->vindex_creation_is_running = FALSE;
+ gpp->vindex_creation_is_running = TRUE;
+ GVA_count_frames(gpp->gvahand);
+ gpp->vindex_creation_is_running = FALSE;
/* printf("PLAYER: open after GVA_count_frames\n"); */
- gtk_widget_hide (gpp->cancel_vindex_button);
- gtk_widget_show (gpp->play_n_stop_hbox);
+ gtk_widget_hide (gpp->cancel_vindex_button);
+ gtk_widget_show (gpp->play_n_stop_hbox);
- if(!gpp->cancel_video_api)
- {
- if(gpp->gvahand->vindex == NULL)
- {
+ if(!gpp->cancel_video_api)
+ {
+ if(gpp->gvahand->vindex == NULL)
+ {
g_message(_("No videoindex available. "
- "Access is limited to (slow) sequential read "
- "on file: %s")
- , gpp->gvahand->filename
- );
- }
- }
+ "Access is limited to (slow) sequential read "
+ "on file: %s")
+ , gpp->gvahand->filename
+ );
+ }
+ }
}
}
@@ -2764,15 +2764,15 @@
static guchar *
p_fetch_videoframe(GapPlayerMainGlobalParams *gpp
, char *gva_videofile
- , gint32 framenumber
- , gint32 rangesize
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- , gint32 *th_bpp
- , gint32 *th_width
- , gint32 *th_height
- )
+ , gint32 framenumber
+ , gint32 rangesize
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ , gint32 *th_bpp
+ , gint32 *th_width
+ , gint32 *th_height
+ )
{
guchar *th_data;
@@ -2823,17 +2823,17 @@
{
char *value_string;
- value_string = gimp_gimprc_query("video-max-frames-keep-cached");
+ value_string = gimp_gimprc_query("video-max-frames-keep-cached");
- if(value_string)
- {
+ if(value_string)
+ {
//printf(" VIDFETCH (4) gimprc: value_string: %s\n", value_string);
- global_max_vid_frames_to_keep_cached = atol(value_string);
- }
- if(global_max_vid_frames_to_keep_cached < 1)
- {
- global_max_vid_frames_to_keep_cached = GAP_PLAYER_VID_FRAMES_TO_KEEP_CACHED;
- }
+ global_max_vid_frames_to_keep_cached = atol(value_string);
+ }
+ if(global_max_vid_frames_to_keep_cached < 1)
+ {
+ global_max_vid_frames_to_keep_cached = GAP_PLAYER_VID_FRAMES_TO_KEEP_CACHED;
+ }
}
fcache_size = CLAMP(rangesize, 1, global_max_vid_frames_to_keep_cached);
@@ -2842,7 +2842,7 @@
//printf(" VIDFETCH (5) gimprc: FCACHE_MAX:%d fcache_size:%d rangesize:%d\n"
// , (int)global_max_vid_frames_to_keep_cached
// , (int)fcache_size
-// , (int)rangesize
+// , (int)rangesize
// );
GVA_set_fcache_size(gpp->gvahand, fcache_size);
@@ -2873,16 +2873,16 @@
, framenumber
, l_deinterlace
, l_threshold
- , th_bpp
- , th_width
- , th_height
+ , th_bpp
+ , th_width
+ , th_height
);
//printf(" VIDFETCH (7) current_seek_nr:%d current_frame_nr:%d\n", (int)gpp->gvahand->current_seek_nr ,(int)gpp->gvahand->current_frame_nr );
if(gpp->progress_bar)
{
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(gpp->progress_bar)
,gpp->progress_bar_idle_txt
- );
+ );
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(gpp->progress_bar), 0.0);
}
}
@@ -2930,9 +2930,9 @@
{
if((gpp->imagename) && (gpp->gvahand->all_frames_counted))
{
- gpp->ainfo_ptr->frame_cnt = gpp->gvahand->total_frames;
- gpp->ainfo_ptr->last_frame_nr = gpp->gvahand->total_frames;
- p_update_ainfo_dependent_widgets(gpp);
+ gpp->ainfo_ptr->frame_cnt = gpp->gvahand->total_frames;
+ gpp->ainfo_ptr->last_frame_nr = gpp->gvahand->total_frames;
+ p_update_ainfo_dependent_widgets(gpp);
}
}
}
@@ -3235,10 +3235,10 @@
*/
static gint32
p_fetch_composite_image(GapPlayerMainGlobalParams *gpp
- , gint32 framenumber
- , gint32 width
- , gint32 height
- )
+ , gint32 framenumber
+ , gint32 width
+ , gint32 height
+ )
{
gint32 composite_image_id;
@@ -3565,7 +3565,7 @@
, th_bpp
, TRUE /* allow_grab_src_data */
, flip_request
- , flip_status
+ , flip_status
);
if(th_data_was_grabbed)
{
@@ -4343,13 +4343,13 @@
/* the last frame in sequence (l_prev_framenr) would be DROPPED
* to keep exact timing, but now it is time to STOP
* in this case we display that frame,
- * with minimal delay of 8 millisecs via the one-shot go_timer.
+ * with minimal delay of 8 millisecs via the one-shot go_timer.
*/
- gpp->go_job_framenr = l_prev_framenr;
- if(gpp->go_timertag >= 0)
- {
- g_source_remove(gpp->go_timertag);
- }
+ gpp->go_job_framenr = l_prev_framenr;
+ if(gpp->go_timertag >= 0)
+ {
+ g_source_remove(gpp->go_timertag);
+ }
gpp->go_timertag = (gint32) g_timeout_add(8, (GtkFunction)on_timer_go_job, gpp);
}
p_stop_playback(gpp); /* STOP at end of sequence */
@@ -4467,10 +4467,10 @@
if(gpp->gva_lock)
{
/* the video api is still busy with fetching the previous frame
- * (do not disturb, but setup the go_timer for a next try
- * after 96 milliseconds)
- */
- gpp->go_timertag = (gint32) g_timeout_add(96, (GtkFunction)on_timer_go_job, gpp);
+ * (do not disturb, but setup the go_timer for a next try
+ * after 96 milliseconds)
+ */
+ gpp->go_timertag = (gint32) g_timeout_add(96, (GtkFunction)on_timer_go_job, gpp);
/*if(gap_debug) printf("on_timer_go_job: TRY LATER (96msec) %06d\n", (int)gpp->go_job_framenr);*/
}
@@ -4568,7 +4568,7 @@
{
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(gpp->progress_bar)
,gpp->progress_bar_idle_txt
- );
+ );
}
play_was_active = gpp->play_is_active;
p_stop_playback(gpp);
@@ -5054,31 +5054,31 @@
if(button_type == FRAMENR_BUTTON_END)
{
/* set END of the range */
- gpp->end_frame = gpp->play_current_framenr;
- gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
- , (gfloat)gpp->play_current_framenr
- );
- if(gpp->end_frame < gpp->begin_frame)
- {
- gpp->begin_frame = gpp->end_frame;
- gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
- , (gfloat)gpp->begin_frame
- );
- }
- return;
+ gpp->end_frame = gpp->play_current_framenr;
+ gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
+ , (gfloat)gpp->play_current_framenr
+ );
+ if(gpp->end_frame < gpp->begin_frame)
+ {
+ gpp->begin_frame = gpp->end_frame;
+ gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
+ , (gfloat)gpp->begin_frame
+ );
+ }
+ return;
}
/* set BEGIN of the range */
gpp->begin_frame = gpp->play_current_framenr;
gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
, (gfloat)gpp->play_current_framenr
- );
+ );
if(gpp->begin_frame > gpp->end_frame)
{
- gpp->end_frame = gpp->begin_frame;
- gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
- , (gfloat)gpp->end_frame
- );
+ gpp->end_frame = gpp->begin_frame;
+ gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
+ , (gfloat)gpp->end_frame
+ );
}
return;
@@ -5096,10 +5096,10 @@
dummy_layer_id = gap_image_get_any_layer(gpp->image_id);
return_vals = gimp_run_procedure ("plug_in_gap_goto",
&nreturn_vals,
- GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
- GIMP_PDB_IMAGE, gpp->image_id,
- GIMP_PDB_DRAWABLE, dummy_layer_id,
- GIMP_PDB_INT32, gpp->play_current_framenr,
+ GIMP_PDB_INT32, GIMP_RUN_NONINTERACTIVE,
+ GIMP_PDB_IMAGE, gpp->image_id,
+ GIMP_PDB_DRAWABLE, dummy_layer_id,
+ GIMP_PDB_INT32, gpp->play_current_framenr,
GIMP_PDB_END);
if(return_vals)
@@ -5213,15 +5213,15 @@
if(gpp->rest_secs < 0.2)
{
/* currently playing and next update is near,
- * just set the framenr and let the play_timer do the display render job
- */
+ * just set the framenr and let the play_timer do the display render job
+ */
gpp->play_current_framenr = framenr;
}
else
{
/* currently playing, but next update not near
- * render display immediate
- */
+ * render display immediate
+ */
p_display_frame(gpp, framenr);
}
}
@@ -5230,7 +5230,7 @@
/* currently not playing, setup a go_timer job to display framenr */
if(gpp->go_timertag >= 0)
{
- g_source_remove(gpp->go_timertag);
+ g_source_remove(gpp->go_timertag);
}
gpp->go_job_framenr = framenr;
gpp->go_timertag = (gint32) g_timeout_add(8, (GtkFunction)on_timer_go_job, gpp);
@@ -5774,13 +5774,13 @@
gpp->begin_frame = framenr;
gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
, (gfloat)gpp->begin_frame
- );
+ );
if(gpp->begin_frame > gpp->end_frame)
{
- gpp->end_frame = gpp->begin_frame;
- gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
- , (gfloat)gpp->end_frame
- );
+ gpp->end_frame = gpp->begin_frame;
+ gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
+ , (gfloat)gpp->end_frame
+ );
}
return;
}
@@ -5788,14 +5788,14 @@
{
gpp->end_frame = framenr;
gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->to_spinbutton_adj)
- , (gfloat)gpp->end_frame
- );
+ , (gfloat)gpp->end_frame
+ );
if(gpp->end_frame < gpp->begin_frame)
{
- gpp->begin_frame = gpp->end_frame;
- gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
- , (gfloat)gpp->begin_frame
- );
+ gpp->begin_frame = gpp->end_frame;
+ gtk_adjustment_set_value( GTK_ADJUSTMENT(gpp->from_spinbutton_adj)
+ , (gfloat)gpp->begin_frame
+ );
}
return;
}
@@ -6036,10 +6036,10 @@
{
g_message(_("WARNING: Your gimprc file configuration for the audioconverter script\n"
"does not point to an executable program\n"
- "the configured value for %s is: %s\n")
- , "audioconvert_program"
- , envAUDIOCONVERT_TO_WAV
- );
+ "the configured value for %s is: %s\n")
+ , "audioconvert_program"
+ , envAUDIOCONVERT_TO_WAV
+ );
}
}
@@ -6049,19 +6049,19 @@
if ( (cp = g_getenv("AUDIOCONVERT_TO_WAV")) != NULL )
{
g_free(envAUDIOCONVERT_TO_WAV);
- envAUDIOCONVERT_TO_WAV = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
+ envAUDIOCONVERT_TO_WAV = g_strdup(cp); /* Environment overrides compiled in default for WAVPLAYPATH */
if(g_file_test (env_WAVPLAYPATH, G_FILE_TEST_IS_EXECUTABLE) )
{
- script_found = TRUE;
+ script_found = TRUE;
}
else
{
- g_message(_("WARNING: The environment variable %s\n"
+ g_message(_("WARNING: The environment variable %s\n"
"does not point to an executable program\n"
- "the current value is: %s\n")
- , "AUDIOCONVERT_TO_WAV"
- , envAUDIOCONVERT_TO_WAV
- );
+ "the current value is: %s\n")
+ , "AUDIOCONVERT_TO_WAV"
+ , envAUDIOCONVERT_TO_WAV
+ );
}
}
}
@@ -6070,15 +6070,15 @@
{
g_free(envAUDIOCONVERT_TO_WAV);
envAUDIOCONVERT_TO_WAV = g_build_filename(GAPLIBDIR
- , "audioconvert_to_wav.sh"
- , NULL
- );
+ , "audioconvert_to_wav.sh"
+ , NULL
+ );
if(!g_file_test(envAUDIOCONVERT_TO_WAV, G_FILE_TEST_IS_EXECUTABLE))
{
g_message(_("ERROR: The external program for audioconversion is not executable.\n"
- "Filename: '%s'\n")
- , envAUDIOCONVERT_TO_WAV
- );
+ "Filename: '%s'\n")
+ , envAUDIOCONVERT_TO_WAV
+ );
return;
}
script_found = TRUE;
@@ -6093,7 +6093,7 @@
printf("CREATE WAVFILE as %s\n"
" in progress ***\n"
- ,gpp->audio_wavfile_tmp );
+ ,gpp->audio_wavfile_tmp );
gtk_label_set_text ( GTK_LABEL(gpp->audio_status_label), _("Creating audiofile - please wait"));
gtk_widget_hide(gpp->audio_table);
@@ -6200,7 +6200,7 @@
g_snprintf(gpp->audio_filename, sizeof(gpp->audio_filename), "%s"
, gtk_entry_get_text(GTK_ENTRY(gpp->audio_filename_entry))
- );
+ );
p_audio_filename_changed(gpp);
@@ -6283,21 +6283,21 @@
gtk_window_set_position (GTK_WINDOW (gpp->audio_filesel), GTK_WIN_POS_MOUSE);
gtk_file_selection_set_filename (GTK_FILE_SELECTION (gpp->audio_filesel),
- gpp->audio_filename);
+ gpp->audio_filename);
gtk_widget_show (gpp->audio_filesel);
g_signal_connect (G_OBJECT (gpp->audio_filesel), "destroy",
- G_CALLBACK (on_audio_filesel_close_cb),
- gpp);
+ G_CALLBACK (on_audio_filesel_close_cb),
+ gpp);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (gpp->audio_filesel)->ok_button),
- "clicked",
+ "clicked",
G_CALLBACK (on_audio_filesel_ok_cb),
- gpp);
+ gpp);
g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (gpp->audio_filesel)->cancel_button),
- "clicked",
+ "clicked",
G_CALLBACK (on_audio_filesel_close_cb),
- gpp);
+ gpp);
} /* end on_audio_filesel_button_clicked */
@@ -6375,10 +6375,10 @@
gtk_entry_set_text(GTK_ENTRY(entry), gpp->audio_filename);
gtk_table_attach(GTK_TABLE(table1), entry, 1, 2, row, row + 1,
(GtkAttachOptions) GTK_FILL | GTK_EXPAND | GTK_SHRINK,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect(G_OBJECT(entry), "changed",
- G_CALLBACK (on_audio_filename_entry_changed),
- gpp);
+ G_CALLBACK (on_audio_filename_entry_changed),
+ gpp);
/* audiofile button (fileselect invoker) */
@@ -6387,7 +6387,7 @@
gimp_help_set_help_data(button, _("Open audiofile selection browser dialog window"),NULL);
gtk_table_attach(GTK_TABLE(table1), button, 2, 3, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_audio_filesel_button_clicked),
gpp);
@@ -6403,14 +6403,14 @@
/* volume spinutton */
spinbutton = gimp_spin_button_new (&adj, /* return value */
- gpp->audio_volume, /* initial_val */
- 0.0, /* umin */
- 1.0, /* umax */
- 0.01, /* sstep */
- 0.1, /* pagestep */
- 0.0, /* page_size */
- 0.1, /* climb_rate */
- 2 /* digits */
+ gpp->audio_volume, /* initial_val */
+ 0.0, /* umin */
+ 1.0, /* umax */
+ 0.01, /* sstep */
+ 0.1, /* pagestep */
+ 0.0, /* page_size */
+ 0.1, /* climb_rate */
+ 2 /* digits */
);
gtk_widget_show (spinbutton);
/*gtk_widget_set_sensitive(spinbutton, FALSE);*/ /* VOLUME CONTROL NOT IMPLEMENTED YET !!! */
@@ -6426,7 +6426,7 @@
gpp->audio_enable_checkbutton = check_button;
gtk_table_attach ( GTK_TABLE (table1), check_button, 2, 3, row, row+1, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
- gpp->audio_enable);
+ gpp->audio_enable);
gimp_help_set_help_data(check_button, _("ON: Play button plays video + audio.\n"
"OFF: Play video silently"),NULL);
gtk_widget_show (check_button);
@@ -6444,14 +6444,14 @@
/* offset spinutton */
spinbutton = gimp_spin_button_new (&adj, /* return value */
- gpp->audio_frame_offset, /* initial_val */
- -500000, /* umin */
- 500000, /* umax */
- 1.0, /* sstep */
- 100, /* pagestep */
- 0, /* page_size */
- 1, /* climb_rate */
- 0 /* digits */
+ gpp->audio_frame_offset, /* initial_val */
+ -500000, /* umin */
+ 500000, /* umax */
+ 1.0, /* sstep */
+ 100, /* pagestep */
+ 0, /* page_size */
+ 1, /* climb_rate */
+ 0 /* digits */
);
gtk_widget_show (spinbutton);
gpp->audio_frame_offset_spinbutton_adj = adj;
@@ -6461,11 +6461,11 @@
"A value of 0 starts audio and video at synchron time. "
"A value of -10 will play frame 1 up to frame 9 silently "
"and start audio at frame 10. "
- "A value of 10 starts audio at frame 1, "
- "but skips the audio begin part in a length that is "
- "equal to the duration of 10 frames "
- "at original video playback speed.")
- ,NULL);
+ "A value of 10 starts audio at frame 1, "
+ "but skips the audio begin part in a length that is "
+ "equal to the duration of 10 frames "
+ "at original video playback speed.")
+ ,NULL);
g_signal_connect (G_OBJECT (gpp->audio_frame_offset_spinbutton_adj), "value_changed",
G_CALLBACK (on_audio_frame_offset_spinbutton_changed),
gpp);
@@ -6543,7 +6543,7 @@
"and use the copy for audio playback"),NULL);
gtk_table_attach(GTK_TABLE(table1), button, 1, 2, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_audio_create_copy_button_clicked),
gpp);
@@ -6554,7 +6554,7 @@
gimp_help_set_help_data(button, _("Reset offset and volume"),NULL);
gtk_table_attach(GTK_TABLE(table1), button, 2, 3, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_audio_reset_button_clicked),
gpp);
@@ -6577,8 +6577,8 @@
gtk_widget_show (hseparator);
gtk_table_attach(GTK_TABLE(table1), hseparator, 0, 3, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL,
- 0, 0);
+ (GtkAttachOptions) GTK_FILL,
+ 0, 0);
row++;
@@ -6911,14 +6911,14 @@
/* frame cache size spinutton */
spinbutton = gimp_spin_button_new (&adj, /* return value */
- mb_cachesize, /* initial_val */
- 0.0, /* umin */
- 9000.0, /* umax */
- 1.0, /* sstep */
- 10.0, /* pagestep */
- 0.0, /* page_size */
- 10.0, /* climb_rate */
- 4 /* digits */
+ mb_cachesize, /* initial_val */
+ 0.0, /* umin */
+ 9000.0, /* umax */
+ 1.0, /* sstep */
+ 10.0, /* pagestep */
+ 0.0, /* page_size */
+ 10.0, /* climb_rate */
+ 4 /* digits */
);
gtk_widget_show (spinbutton);
gpp->cache_size_spinbutton_adj = adj;
@@ -6935,7 +6935,7 @@
gimp_help_set_help_data(button, _("Clear the frame cache"),NULL);
gtk_table_attach(GTK_TABLE(table1), button, 2, 3, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_cache_clear_button_clicked),
gpp);
@@ -7031,7 +7031,7 @@
gimp_help_set_help_data(button, _("Save player cache and layout settings (as gimprc parameters)"),NULL);
gtk_table_attach(GTK_TABLE(table1), button, 1, 2, row, row + 1,
(GtkAttachOptions) GTK_FILL,
- (GtkAttachOptions) GTK_FILL, 4, 0);
+ (GtkAttachOptions) GTK_FILL, 4, 0);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_prefs_save_gimprc_button_clicked),
gpp);
@@ -7221,23 +7221,23 @@
gtk_container_add (GTK_CONTAINER (notebook), spc_hbox0);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), notebook_idx)
- , label_vid
- );
+ , label_vid
+ );
notebook_idx++;
#ifdef GAP_ENABLE_AUDIO_SUPPORT
gtk_container_add (GTK_CONTAINER (notebook), spc_hbox0a);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), notebook_idx)
- , label_aud
- );
+ , label_aud
+ );
notebook_idx++;
#endif
gtk_container_add (GTK_CONTAINER (notebook), spc_hbox0c);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook)
, gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), notebook_idx)
- , label_cfg
- );
+ , label_cfg
+ );
notebook_idx++;
gtk_box_pack_start (GTK_BOX (vbox0), notebook, TRUE, TRUE, 0);
@@ -7328,18 +7328,18 @@
l_value = CLAMP(gpp->play_current_framenr, l_lower, l_upper);
if(gap_debug) printf("CREATE framenr_spinbutton_adj: value: %d, lower:%d, upper:%d\n"
- ,(int)l_value
- ,(int)l_lower
- ,(int)l_upper
- );
+ ,(int)l_value
+ ,(int)l_lower
+ ,(int)l_upper
+ );
framenr_spinbutton_adj = gtk_adjustment_new (l_value
, l_lower
, l_upper
- , 1.0
- , 10.0
- , 0.0 /* must be 0 for simple scale */
- );
+ , 1.0 /* step_increment */
+ , 10.0 /* page_increment */
+ , 0.0 /* page_size must be 0 for simple scalar value */
+ );
}
@@ -7411,7 +7411,7 @@
gtk_table_attach (GTK_TABLE (table1), frame2, 1, 2, 0, 1
, (GtkAttachOptions) (0)
, (GtkAttachOptions) (0)
- , 0, 0);
+ , 0, 0);
/* table2 for range and playback mode control widgets */
table2 = gtk_table_new (18, 2, FALSE);
@@ -7438,15 +7438,15 @@
gtk_box_pack_start (GTK_BOX (fnr_hbox), framenr_1_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (framenr_1_button), KEY_FRAMENR_BUTTON_TYPE, (gpointer)FRAMENR_BUTTON_BEGIN);
g_signal_connect (G_OBJECT (framenr_1_button), "button_press_event",
- G_CALLBACK (on_framenr_button_clicked),
- gpp);
+ G_CALLBACK (on_framenr_button_clicked),
+ gpp);
if((gpp->image_id >= 0)
&& (gpp->docking_container == NULL))
{
gimp_help_set_help_data (framenr_1_button
, _("Click: Set current framenr as selection range start 'From Frame',\n"
- "SHIFT-Click: load this frame into the calling image")
- , NULL);
+ "SHIFT-Click: load this frame into the calling image")
+ , NULL);
}
else
{
@@ -7456,7 +7456,7 @@
*/
gimp_help_set_help_data (framenr_1_button
, _("Set current framenr as selection range start 'From Frame'")
- , NULL);
+ , NULL);
}
/* the framenr 2 button (does set End of range) */
@@ -7465,15 +7465,15 @@
gtk_box_pack_start (GTK_BOX (fnr_hbox), framenr_2_button, TRUE, TRUE, 0);
g_object_set_data (G_OBJECT (framenr_2_button), KEY_FRAMENR_BUTTON_TYPE, (gpointer)FRAMENR_BUTTON_END);
g_signal_connect (G_OBJECT (framenr_2_button), "button_press_event",
- G_CALLBACK (on_framenr_button_clicked),
- gpp);
+ G_CALLBACK (on_framenr_button_clicked),
+ gpp);
if((gpp->image_id >= 0)
&& (gpp->docking_container == NULL))
{
gimp_help_set_help_data (framenr_2_button
, _("Click: Set current framenr as selection range end 'To Frame',\n"
- "SHIFT-Click: load this frame into the calling image")
- , NULL);
+ "SHIFT-Click: load this frame into the calling image")
+ , NULL);
}
else
{
@@ -7483,12 +7483,15 @@
*/
gimp_help_set_help_data (framenr_2_button
, _("Set current framenr as selection range end 'To Frame'")
- , NULL);
+ , NULL);
}
}
/* the FRAMENR spinbutton (current displayed frame) */
- framenr_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (framenr_spinbutton_adj), 1, 0);
+ framenr_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (framenr_spinbutton_adj)
+ , 1 /* climb_rate */
+ , 0 /* digits */
+ );
gtk_widget_show (framenr_spinbutton);
gtk_table_attach (GTK_TABLE (table2), framenr_spinbutton, colspin, colspin+1, row, row+1,
(GtkAttachOptions) (0),
@@ -7513,7 +7516,7 @@
gtk_table_attach (GTK_TABLE (table2), from_button, colbutton, colbutton+1, row, row+1
, (GtkAttachOptions) (GTK_FILL)
, (GtkAttachOptions) (0)
- , 0, 0);
+ , 0, 0);
if(gpp->caller_range_linked)
{
gtk_widget_set_sensitive (from_button, FALSE);
@@ -7529,21 +7532,24 @@
gimp_help_set_help_data (from_button, _("Print range to stdout"), NULL);
}
g_signal_connect (G_OBJECT (from_button), "clicked",
- G_CALLBACK (on_from_button_clicked),
- gpp);
+ G_CALLBACK (on_from_button_clicked),
+ gpp);
}
/* the FROM spinbutton (start of rangeselection) */
from_spinbutton_adj = gtk_adjustment_new ( gpp->begin_frame
, gpp->ainfo_ptr->first_frame_nr
, gpp->ainfo_ptr->last_frame_nr
- , 1, 10, 10);
+ , 1.0 /* step_increment */
+ , 10.0 /* page_increment */
+ , 0.0 /* page_size must be 0 for simple scalar value */
+ );
from_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (from_spinbutton_adj), 1, 0);
gtk_widget_show (from_spinbutton);
gtk_table_attach (GTK_TABLE (table2), from_spinbutton, colspin, colspin+1, row, row+1,
(GtkAttachOptions) (0),
(GtkAttachOptions) (0),
- 0, 0);
+ 0, 0);
gtk_widget_set_size_request (from_spinbutton, 80, -1);
gimp_help_set_help_data (from_spinbutton, _("Start framenumber of selection range"), NULL);
g_signal_connect (G_OBJECT (from_spinbutton_adj), "value_changed",
@@ -7559,7 +7565,7 @@
gtk_table_attach (GTK_TABLE (table2), to_button, colbutton, colbutton+1, row, row+1
, (GtkAttachOptions) (GTK_FILL)
, (GtkAttachOptions) (0)
- , 0, 0);
+ , 0, 0);
if(gpp->caller_range_linked)
{
gtk_widget_set_sensitive (to_button, FALSE);
@@ -7575,8 +7581,8 @@
gimp_help_set_help_data (to_button, _("Print inverse range to stdout"), NULL);
}
g_signal_connect (G_OBJECT (to_button), "clicked",
- G_CALLBACK (on_to_button_clicked),
- gpp);
+ G_CALLBACK (on_to_button_clicked),
+ gpp);
}
@@ -7585,13 +7591,16 @@
to_spinbutton_adj = gtk_adjustment_new ( gpp->end_frame
, gpp->ainfo_ptr->first_frame_nr
, gpp->ainfo_ptr->last_frame_nr
- , 1, 10, 10);
+ , 1.0 /* step_increment */
+ , 10.0 /* page_increment */
+ , 0.0 /* page_size must be 0 for simple scalar value */
+ );
to_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (to_spinbutton_adj), 1, 0);
gtk_widget_show (to_spinbutton);
gtk_table_attach (GTK_TABLE (table2), to_spinbutton, colspin, colspin+1, row, row+1,
(GtkAttachOptions) (0),
(GtkAttachOptions) (0),
- 0, 0);
+ 0, 0);
gtk_widget_set_size_request (to_spinbutton, 80, -1);
gimp_help_set_help_data (to_spinbutton, _("End framenumber of selection range"), NULL);
g_signal_connect (G_OBJECT (to_spinbutton_adj), "value_changed",
@@ -7622,7 +7631,10 @@
speed_spinbutton_adj = gtk_adjustment_new ( gpp->speed
, 1.0
, 250.0
- , 1, 10, 10);
+ , 1.0 /* step_increment */
+ , 10.0 /* page_increment */
+ , 0.0 /* page_size must be 0 for simple scalar value */
+ );
speed_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (speed_spinbutton_adj), 1, 4);
gtk_widget_show (speed_spinbutton);
gtk_table_attach (GTK_TABLE (table2), speed_spinbutton, colspin, colspin+1, row, row+1,
@@ -7654,7 +7666,7 @@
gtk_table_attach (GTK_TABLE (table2), size_button, colbutton, colbutton+1, row, row+1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0),
- 0, 0);
+ 0, 0);
gimp_help_set_help_data (size_button, _("Toggle size 128/256. <Shift> Set 1:1 full image size"), NULL);
g_signal_connect (G_OBJECT (size_button), "button_press_event",
G_CALLBACK (on_size_button_button_press_event),
@@ -7664,7 +7676,10 @@
size_spinbutton_adj = gtk_adjustment_new (gpp->pv_pixelsize
, GAP_PLAYER_MIN_SIZE
, GAP_PLAYER_MAX_SIZE
- , 1, 10, 10);
+ , 1.0 /* step_increment */
+ , 10.0 /* page_increment */
+ , 0.0 /* page_size must be 0 for simple scalar value */
+ );
size_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (size_spinbutton_adj), 1, 0);
gpp->size_spinbutton = size_spinbutton;
@@ -7672,7 +7687,7 @@
gtk_table_attach (GTK_TABLE (table2), size_spinbutton, colspin, colspin+1, row, row+1,
(GtkAttachOptions) (0),
(GtkAttachOptions) (0),
- 0, 0);
+ 0, 0);
gtk_widget_set_size_request (size_spinbutton, 80, -1);
gimp_help_set_help_data (size_spinbutton, _("Video preview size (pixels)"), NULL);
@@ -7683,11 +7698,11 @@
if(gpp->docking_container == NULL)
{
gtk_widget_set_events(size_spinbutton
- , GDK_ENTER_NOTIFY_MASK
- );
+ , GDK_ENTER_NOTIFY_MASK
+ );
g_signal_connect (G_OBJECT (size_spinbutton), "enter_notify_event",
- G_CALLBACK (on_size_spinbutton_enter),
- gpp);
+ G_CALLBACK (on_size_spinbutton_enter),
+ gpp);
}
gtk_table_set_row_spacing (GTK_TABLE (table2), row, ROW_EXTRA_SPACING);
@@ -7847,8 +7862,8 @@
gtk_box_pack_start (GTK_BOX (hbox1), cancel_vindex_button, FALSE, TRUE, 0);
gimp_help_set_help_data (cancel_vindex_button, _("Cancel videoindex creation. "
"Videoindex creation requires full scanning of the video "
- "but allows fast random access to frames afterwards. "
- "Without a videoindex, access is done by a very slow sequential read"), NULL);
+ "but allows fast random access to frames afterwards. "
+ "Without a videoindex, access is done by a very slow sequential read"), NULL);
g_signal_connect (G_OBJECT (cancel_vindex_button), "clicked",
G_CALLBACK (on_cancel_vindex_button_clicked),
gpp);
@@ -7863,8 +7878,8 @@
gtk_box_pack_start (GTK_BOX (play_n_stop_hbox), help_button, FALSE, TRUE, 0);
gimp_help_set_help_data (help_button, _("Show help page"), NULL);
g_signal_connect (G_OBJECT (help_button), "clicked",
- G_CALLBACK (on_help_button_clicked),
- gpp);
+ G_CALLBACK (on_help_button_clicked),
+ gpp);
}
@@ -7874,8 +7889,8 @@
gtk_box_pack_start (GTK_BOX (play_n_stop_hbox), play_button, FALSE, TRUE, 0);
gimp_help_set_help_data (play_button, _("Start playback. "
"SHIFT: snapshot frames in a multilayer image at original size "
- "CTRL: snapshot at preview size "
- "ALT: force creation of new snapshot image"), NULL);
+ "CTRL: snapshot at preview size "
+ "ALT: force creation of new snapshot image"), NULL);
g_signal_connect (G_OBJECT (play_button), "button_press_event",
G_CALLBACK (on_play_button_clicked),
gpp);
@@ -7897,8 +7912,8 @@
gtk_box_pack_start (GTK_BOX (play_n_stop_hbox), back_button, FALSE, TRUE, 0);
gimp_help_set_help_data (back_button, _("Start reverse playback. "
"SHIFT: snapshot frames in a multilayer image at original size "
- "CTRL: snapshot at preview size "
- "ALT: force creation of new snapshot image"), NULL);
+ "CTRL: snapshot at preview size "
+ "ALT: force creation of new snapshot image"), NULL);
g_signal_connect (G_OBJECT (back_button), "button_press_event",
G_CALLBACK (on_back_button_clicked),
gpp);
@@ -7911,8 +7926,8 @@
gtk_box_pack_start (GTK_BOX (play_n_stop_hbox), close_button, FALSE, TRUE, 0);
gimp_help_set_help_data (close_button, _("Close window"), NULL);
g_signal_connect (G_OBJECT (close_button), "clicked",
- G_CALLBACK (on_close_button_clicked),
- gpp);
+ G_CALLBACK (on_close_button_clicked),
+ gpp);
}
@@ -8084,22 +8099,22 @@
void
gap_player_dlg_restart(GapPlayerMainGlobalParams *gpp
, gboolean autostart
- , gint32 image_id
- , char *imagename
- , gint32 imagewidth
- , gint32 imageheight
- , GapStoryBoard *stb_ptr
- , gint32 begin_frame
- , gint32 end_frame
- , gboolean play_selection_only
- , gint32 seltrack
- , gdouble delace
- , const char *preferred_decoder
- , gboolean force_open_as_video
+ , gint32 image_id
+ , char *imagename
+ , gint32 imagewidth
+ , gint32 imageheight
+ , GapStoryBoard *stb_ptr
+ , gint32 begin_frame
+ , gint32 end_frame
+ , gboolean play_selection_only
+ , gint32 seltrack
+ , gdouble delace
+ , const char *preferred_decoder
+ , gboolean force_open_as_video
, gint32 flip_request
, gint32 flip_status
, gint32 stb_in_track
- )
+ )
{
gboolean reverse_play;
gint32 l_begin_frame;
@@ -8184,7 +8199,7 @@
p_reload_ainfo_ptr(gpp, -1);
if(gpp->ainfo_ptr == NULL)
{
- return;
+ return;
}
}
else
@@ -8192,12 +8207,12 @@
p_reload_ainfo_ptr(gpp, image_id);
if(gpp->ainfo_ptr == NULL)
{
- return;
+ return;
}
if(0 != gap_lib_chk_framerange(gpp->ainfo_ptr))
{
- return;
+ return;
}
}
}
@@ -8210,19 +8225,19 @@
l_begin_frame = CLAMP(begin_frame
, gpp->ainfo_ptr->first_frame_nr
, gpp->ainfo_ptr->last_frame_nr
- );
+ );
}
if(end_frame >= 0)
{
l_end_frame = CLAMP(end_frame
, gpp->ainfo_ptr->first_frame_nr
, gpp->ainfo_ptr->last_frame_nr
- );
+ );
}
l_curr_frame = CLAMP(l_curr_frame
,l_begin_frame
- ,l_end_frame
- );
+ ,l_end_frame
+ );
gpp->begin_frame = l_begin_frame;
gpp->end_frame = l_end_frame;
gpp->play_current_framenr = l_curr_frame;
@@ -8352,7 +8367,7 @@
p_reload_ainfo_ptr(gpp, -1);
if(gpp->ainfo_ptr == NULL)
{
- return;
+ return;
}
}
else
@@ -8360,12 +8375,12 @@
p_reload_ainfo_ptr(gpp, gpp->image_id);
if(gpp->ainfo_ptr == NULL)
{
- return;
+ return;
}
if(0 != gap_lib_chk_framerange(gpp->ainfo_ptr))
{
- return;
+ return;
}
}
}
Modified: trunk/gap/gap_resi_dialog.c
==============================================================================
--- trunk/gap/gap_resi_dialog.c (original)
+++ trunk/gap/gap_resi_dialog.c Tue Jan 20 16:47:26 2009
@@ -26,7 +26,7 @@
/* revision history
* gimp 1.3.14a; 2003/05/25 hof: reincarnation of gap_resi_dialog, now uses GimpOffsetArea
* dialog code was inspired by gimp-core resize-dialog.c
- * to give similar look and feel,
+ * to give similar look and feel,
* but without unit and resolution stuff.
* (videoframes are measured in pixels)
* gimp 1.1.13b; 1999/12/04 hof: some cosmetic gtk fixes
@@ -34,10 +34,10 @@
* to same style as used in dialogs of the gimp 1.1.13 main dialogs
* 0.96.00; 1998/07/01 hof: first release
*/
-
+
#include "config.h"
-/* SYTEM (UNIX) includes */
+/* SYTEM (UNIX) includes */
#include <stdio.h>
/* GIMP includes */
@@ -72,8 +72,8 @@
gint32 offset_y;
gdouble ratio_x;
gdouble ratio_y;
-
-
+
+
GtkWidget *dlg;
gint run;
GtkWidget *shell;
@@ -101,7 +101,7 @@
* -----------------------------
* IN: offset value
* RETURN the offsetvalue CLAMped to the legal boundaries.
- *
+ *
* This procedures do also set lowr/upper limits for the
* offset adjustment widgets
*/
@@ -110,11 +110,11 @@
gint off_x)
{
if( res_private->offset_x_adj == NULL) { return 0; }
-
+
if (res_private->orig_width <= res_private->width)
{
off_x = CLAMP (off_x, 0, (res_private->width - res_private->orig_width));
-
+
GTK_ADJUSTMENT(res_private->offset_x_adj)->lower = 0;
GTK_ADJUSTMENT(res_private->offset_x_adj)->upper = res_private->width - res_private->orig_width;
}
@@ -133,7 +133,7 @@
gint off_y)
{
if( res_private->offset_y_adj == NULL) { return 0; }
-
+
if (res_private->orig_height <= res_private->height)
{
off_y = CLAMP (off_y, 0, (res_private->height - res_private->orig_height));
@@ -253,7 +253,7 @@
res_private = (GapResizePrivateType *)data;
if(res_private == NULL) {return;}
-
+
res_private->width = res_private->orig_width;
res_private->height = res_private->orig_height;
p_set_size_spinbuttons(res_private);
@@ -264,10 +264,10 @@
res_private->offset_x = 0;
res_private->offset_y = 0;
p_set_offset_spinbuttons(res_private);
- gimp_offset_area_set_size (GIMP_OFFSET_AREA (res_private->offset_area),
+ gimp_offset_area_set_size (GIMP_OFFSET_AREA (res_private->offset_area),
res_private->width, res_private->height);
gimp_offset_area_set_offsets (GIMP_OFFSET_AREA (res_private->offset_area),
- res_private->offset_x, res_private->offset_y);
+ res_private->offset_x, res_private->offset_y);
}
} /* end p_res_reset_callback */
@@ -287,15 +287,15 @@
res_private->ratio_x = ratio_x;
res_private->ratio_y = ratio_y;
-
+
if(res_private->in_call) { return; }
res_private->in_call = TRUE;
-
+
if (res_private->offset_area)
{
- gimp_offset_area_set_size (GIMP_OFFSET_AREA (res_private->offset_area),
+ gimp_offset_area_set_size (GIMP_OFFSET_AREA (res_private->offset_area),
res_private->width, res_private->height);
p_resize_bound_off_x(res_private, 0);
p_resize_bound_off_y(res_private, 0);
@@ -303,9 +303,9 @@
}
p_set_size_spinbuttons(res_private);
-
+
res_private->in_call = FALSE;
-
+
} /* end p_size_update */
@@ -414,13 +414,13 @@
ofs_y = GTK_ADJUSTMENT(res_private->offset_y_adj)->value;
res_private->offset_x = p_resize_bound_off_x (res_private, RINT(ofs_x));
-
+
res_private->offset_y = p_resize_bound_off_y (res_private, RINT(ofs_y));
gimp_offset_area_set_offsets (GIMP_OFFSET_AREA (res_private->offset_area)
, res_private->offset_x
- , res_private->offset_y);
+ , res_private->offset_y);
} /* end p_offset_update */
/* -----------------------------
@@ -440,10 +440,10 @@
(res_private->width - res_private->orig_width) / 2);
res_private->offset_x = off_x;
-
+
p_set_offset_spinbuttons(res_private);
gimp_offset_area_set_offsets (GIMP_OFFSET_AREA (res_private->offset_area),
- res_private->offset_x, res_private->offset_y);
+ res_private->offset_x, res_private->offset_y);
} /* end p_offset_x_center_clicked */
/* -----------------------------
@@ -463,10 +463,10 @@
(res_private->height - res_private->orig_height) / 2);
res_private->offset_y = off_y;
-
+
p_set_offset_spinbuttons(res_private);
gimp_offset_area_set_offsets (GIMP_OFFSET_AREA (res_private->offset_area),
- res_private->offset_x, res_private->offset_y);
+ res_private->offset_x, res_private->offset_y);
} /* end p_offset_y_center_clicked */
@@ -503,7 +503,7 @@
{
res_private->offset_x = offset_x;
res_private->offset_y = offset_y;
-
+
p_set_offset_spinbuttons(res_private);
}
} /* end p_offset_area_offsets_changed */
@@ -538,14 +538,14 @@
* Resize dialog used for resize and cropping frames
* based on the GimpOffsetArea widget
*/
-
+
gint
gap_resi_dialog (gint32 image_id, GapRangeOpsAsiz asiz_mode, char *title_text,
- long *size_x, long *size_y,
+ long *size_x, long *size_y,
long *offs_x, long *offs_y)
{
gint l_run;
-
+
GapResizePrivateType *res_private;
GtkWidget *hbbox;
GtkWidget *button;
@@ -592,7 +592,7 @@
l_max_image_height = GIMP_MAX_IMAGE_SIZE;
l_max_ratio_x = (gdouble) GIMP_MAX_IMAGE_SIZE / (double) res_private->width;
l_max_ratio_y = (gdouble) GIMP_MAX_IMAGE_SIZE / (double) res_private->height;
-
+
/* for CROP mode only: set sizelimit to original width/height */
if(res_private->asiz_mode == GAP_ASIZ_CROP)
{
@@ -708,10 +708,10 @@
/* the spinbutton entry new_width */
spinbutton = gimp_spin_button_new (&res_private->width_adj,
- res_private->orig_width,
- GIMP_MIN_IMAGE_SIZE,
- l_max_image_width,
- 1, 10, 1,
+ res_private->orig_width,
+ GIMP_MIN_IMAGE_SIZE,
+ l_max_image_width,
+ 1, 10, 0,
1, 2);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
@@ -726,10 +726,10 @@
/* the spinbutton entry new_height */
spinbutton = gimp_spin_button_new (&res_private->height_adj,
- res_private->orig_height,
+ res_private->orig_height,
GIMP_MIN_IMAGE_SIZE,
- l_max_image_height,
- 1, 10, 1,
+ l_max_image_height,
+ 1, 10, 0,
1, 2);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
@@ -758,7 +758,7 @@
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
-
+
/* a (2nd) table for the spinbuttons and the chainbutton */
abox = gtk_alignment_new (0.0, 0.5, 0.0, 1.0);
table2 = gtk_table_new (2, 2, FALSE);
@@ -772,10 +772,10 @@
/* the spinbutton entry X-scale ratio */
spinbutton =
gimp_spin_button_new (&res_private->ratio_x_adj,
- res_private->ratio_x,
+ res_private->ratio_x,
(double) GIMP_MIN_IMAGE_SIZE / (double) res_private->width,
(double) l_max_ratio_x,
- 0.01, 0.1, 1,
+ 0.01, 0.1, 0,
0.01, 4);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1);
@@ -784,14 +784,14 @@
g_signal_connect (res_private->ratio_x_adj, "value_changed",
G_CALLBACK (p_ratio_callback),
res_private);
-
+
/* the spinbutton entry Y-scale ratio */
spinbutton =
gimp_spin_button_new (&res_private->ratio_y_adj,
res_private->ratio_y,
(double) GIMP_MIN_IMAGE_SIZE / (double) res_private->height,
(double) l_max_ratio_y,
- 0.01, 0.1, 1,
+ 0.01, 0.1, 0,
0.01, 4);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2);
@@ -810,7 +810,7 @@
gimp_help_set_help_data (GIMP_CHAIN_BUTTON (res_private->constrain)->button,
_("Constrain aspect ratio"), NULL);
-
+
/* the state of the contrain ratio chainbutton is checked in other callbacks (where needed)
* there is no need for the chainbutton to have its own callback procedure
*/
@@ -835,33 +835,33 @@
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), abox, FALSE, FALSE, 0);
-
+
/* a (3rd) table for the offset spinbuttons */
table3 = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table3), 0, 2);
gtk_table_set_row_spacing (GTK_TABLE (table3), 0, 2);
-
+
/* gtk_container_add (GTK_CONTAINER (abox), table3); */
-
+
/* the x/y offest labels */
label = gtk_label_new (_("X:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (table3), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
-
+
label = gtk_label_new (_("Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (table3), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
-
+
/* the spinbutton entry offset_x */
spinbutton = gimp_spin_button_new (&res_private->offset_x_adj,
- 0,
- -GIMP_MAX_IMAGE_SIZE,
- GIMP_MAX_IMAGE_SIZE,
- 1, 10, 1,
+ 0,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE,
+ 1, 10, 0,
1, 2);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
gtk_table_attach (GTK_TABLE (table3), spinbutton, 1, 2, 0, 1,
@@ -875,10 +875,10 @@
/* the spinbutton entry offset_y */
spinbutton = gimp_spin_button_new (&res_private->offset_y_adj,
- 0,
- -GIMP_MAX_IMAGE_SIZE,
- GIMP_MAX_IMAGE_SIZE,
- 1, 10, 1,
+ 0,
+ -GIMP_MAX_IMAGE_SIZE,
+ GIMP_MAX_IMAGE_SIZE,
+ 1, 10, 0,
1, 2);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
gtk_table_attach (GTK_TABLE (table3), spinbutton, 1, 2, 1, 2,
@@ -999,7 +999,7 @@
*offs_x = - res_private->offset_x;
*offs_y = - res_private->offset_y;
}
-
+
l_run = res_private->run;
g_free(res_private);
return (l_run);
Modified: trunk/gap/gap_story_att_trans_dlg.c
==============================================================================
--- trunk/gap/gap_story_att_trans_dlg.c (original)
+++ trunk/gap/gap_story_att_trans_dlg.c Tue Jan 20 16:47:26 2009
@@ -299,7 +299,7 @@
{
attw->stb_refptr->active_section->version++;
}
-
+
}
}
} /* end p_attw_push_undo_and_set_unsaved_changes */
@@ -320,7 +320,7 @@
if(attw->stb_elem_refptr)
{
p_attw_push_undo_and_set_unsaved_changes(attw);
-
+
gap_story_elem_copy(attw->stb_elem_refptr, attw->stb_elem_bck);
comment_set = FALSE;
@@ -352,8 +352,8 @@
}
gtk_adjustment_set_value(GTK_ADJUSTMENT(attw->spinbutton_overlap_dur_adj)
, attw->stb_elem_refptr->att_overlap);
-
-
+
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (attw->fit_width_toggle)
, attw->stb_elem_refptr->att_fit_width);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (attw->fit_height_toggle)
@@ -368,7 +368,7 @@
} /* end p_attw_prop_reset_all */
-
+
/* ------------------------------
* p_playback_effect_range
* ------------------------------
@@ -418,7 +418,7 @@
{
attw->timer_full_update_request = FALSE;
p_update_full_preview_gfx(attw);
-
+
/* it would be sufficient to update the labels
* of all clips displayed in the storyboard,
* but we simply render everything
@@ -642,7 +642,7 @@
if(attw)
{
gint ii;
-
+
p_attw_push_undo_and_set_unsaved_changes(attw);
for(ii = 0; ii < GAP_STB_ATT_TYPES_ARRAY_MAX; ii++)
{
@@ -784,7 +784,7 @@
{
printf("gint32_adjustment_callback: obj:%d old_val:%d val:%d\n"
,(int)obj
- ,(int)*val
+ ,(int)*val
,(int)l_val
);
}
@@ -1420,7 +1420,7 @@
prefetch_visible = TRUE;
}
}
-
+
return (prefetch_visible);
} /* end p_calculate_prefetch_visibility */
@@ -1463,7 +1463,7 @@
, LAYERSTACK_PREF
, LAYERNAME_PREF
);
-
+
p_calculate_render_attributes (attw
, img_idx
@@ -1764,7 +1764,7 @@
&& (stb_ret->stb_elem))
{
gboolean is_up_to_date;
-
+
l_filename = gap_story_get_filename_from_elem_nr(stb_ret->stb_elem
, stb_ret->ret_framenr
);
@@ -1825,7 +1825,7 @@
if(l_layer_id > 0)
{
l_layer_id = gap_layer_flip(l_layer_id, stb_ret->stb_elem->flip_request);
-
+
linfo->layer_record_type = stb_ret->stb_elem->record_type;
linfo->layer_local_framenr = 0;
linfo->layer_seltrack = 1;
@@ -1895,14 +1895,14 @@
if(attw->stb_elem_refptr->att_overlap > 0)
{
l_prefetch_framenr = CLAMP((l_framenr - attw->stb_elem_refptr->att_overlap), 0, l_framenr_start);
-
+
if(l_prefetch_framenr > 0)
{
l_dsiplay_framenr = l_prefetch_framenr;
}
}
p_update_framenr_labels(attw, img_idx, l_dsiplay_framenr);
-
+
return (l_dsiplay_framenr);
} /* end p_calc_and_set_display_framenr */
@@ -1922,7 +1922,7 @@
*
* If the orig_layer is up to date the fetch is not performed.
*
- * if overlapping is used (att_overap > 0)
+ * if overlapping is used (att_overap > 0)
* we prefetch a 2.nd original (the opre_layer) that shall be rendered
* below the orig_layer. its position is current - att_overap
*
@@ -1959,7 +1959,7 @@
}
p_calc_and_set_display_framenr(attw, img_idx, duration );
-
+
/* OPRE_LAYER (re)creation */
if(l_prefetch_framenr > 0)
{
@@ -1971,7 +1971,7 @@
,&attw->gfx_tab[img_idx].opre_info /* linfo */
);
}
-
+
p_check_and_make_opre_default_layer(attw, img_idx);
@@ -2501,7 +2501,7 @@
, 999999
, 1
, 10
- , 10
+ , 0
);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
attw->att_rows[att_type_idx].spinbutton_dur_adj = adj;
@@ -2602,7 +2602,7 @@
row = 0;
-
+
/* the fit size label */
label = gtk_label_new (_("FitSize:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -2673,7 +2673,7 @@
GtkObject *adj;
GtkWidget *spinbutton;
GtkWidget *button;
-
+
/* the overlap label (same row as FitSize) */
label = gtk_label_new (_("Overlap:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.9, 0.5);
@@ -2699,7 +2699,7 @@
, 999999
, 1
, 10
- , 10
+ , 0
);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
attw->spinbutton_overlap_dur_adj = adj;
@@ -2735,7 +2735,7 @@
, 100.0 /* upper constraint for the from/to values */
, 1.0 /* step increment for the from/to values */
, 10.0 /* page increment for the from/to values */
- , 10.0 /* page size for the from/to values */
+ , 0.0 /* page size for the from/to values */
, 0 /* digits for the from/to values */
, _("ON: Enable opacity settings")
, &attw->stb_elem_refptr->att_arr_enable[att_type_idx]
@@ -2761,7 +2761,7 @@
, 1000.0 /* upper constraint for the from/to values */
, 1.0 /* step increment for the from/to values */
, 10.0 /* page increment for the from/to values */
- , 10.0 /* page size for the from/to values */
+ , 0.0 /* page size for the from/to values */
, 2 /* digits for the from/to values */
, _("ON: Enable move horizontal settings")
, &attw->stb_elem_refptr->att_arr_enable[att_type_idx]
@@ -2788,7 +2788,7 @@
, 1000.0 /* upper constraint for the from/to values */
, 1.0 /* step increment for the from/to values */
, 10.0 /* page increment for the from/to values */
- , 10.0 /* page size for the from/to values */
+ , 0.0 /* page size for the from/to values */
, 2 /* digits for the from/to values */
, _("ON: Enable move vertical settings")
, &attw->stb_elem_refptr->att_arr_enable[att_type_idx]
@@ -2814,7 +2814,7 @@
, 1000.0 /* upper constraint for the from/to values */
, 1.0 /* step increment for the from/to values */
, 10.0 /* page increment for the from/to values */
- , 10.0 /* page size for the from/to values */
+ , 0.0 /* page size for the from/to values */
, 2 /* digits for the from/to values */
, _("ON: Enable scale width settings")
, &attw->stb_elem_refptr->att_arr_enable[att_type_idx]
@@ -2840,7 +2840,7 @@
, 1000.0 /* upper constraint for the from/to values */
, 1.0 /* step increment for the from/to values */
, 10.0 /* page increment for the from/to values */
- , 10.0 /* page size for the from/to values */
+ , 0.0 /* page size for the from/to values */
, 2 /* digits for the from/to values */
, _("ON: Enable scale height settings")
, &attw->stb_elem_refptr->att_arr_enable[att_type_idx]
Modified: trunk/gap/gap_story_dialog.c
==============================================================================
--- trunk/gap/gap_story_dialog.c (original)
+++ trunk/gap/gap_story_dialog.c Tue Jan 20 16:47:26 2009
@@ -397,7 +397,7 @@
, gint32 default_value, gint32 min_value, gint32 max_value);
static gboolean p_get_gimprc_gboolean_value (const char *gimprc_option_name
, gboolean default_value);
-
+
static gint32 p_get_gimprc_preview_size(const char *gimprc_option_name);
static void p_save_gimprc_preview_size(const char *gimprc_option_name, gint32 preview_size);
static void p_save_gimprc_int_value(const char *gimprc_option_name, gint32 value);
@@ -417,7 +417,7 @@
p_get_gapdebug_storyboard_config_file()
{
char *filename;
-
+
filename = g_build_filename(gimp_directory(), GAP_DEBUG_STORYBOARD_CONFIG_FILE, NULL);
return (filename);
}
@@ -433,15 +433,15 @@
{
gboolean enable;
char *filename;
-
+
enable = FALSE;
-
- if((gap_debug)
+
+ if((gap_debug)
|| (g_file_test(GAP_DEBUG_STORYBOARD_CONFIG_FILE, G_FILE_TEST_EXISTS)))
{
return(TRUE);
}
-
+
filename = p_get_gapdebug_storyboard_config_file();
if(filename)
{
@@ -466,7 +466,7 @@
{
gboolean enable;
char *filename;
-
+
enable = FALSE;
filename = p_get_gapdebug_storyboard_config_file();
if(filename)
@@ -594,9 +594,9 @@
if(recreate)
{
GapStbTabWidgets *tabw;
-
+
tabw = (GapStbTabWidgets *)pw->tabw;
-
+
/* refresh storyboard layout and thumbnail list widgets */
p_recreate_tab_widgets( pw->stb_refptr
,tabw
@@ -809,7 +809,7 @@
,(int)sgpp_ptr->vthumb_prefetch_in_progress
);
}
-
+
if(sgpp_ptr->vthumb_prefetch_in_progress == GAP_VTHUMB_PREFETCH_IN_PROGRESS)
{
sgpp_ptr->vthumb_prefetch_in_progress = GAP_VTHUMB_PREFETCH_RESTART_REQUEST;
@@ -1490,13 +1490,13 @@
if(fw)
{
GapStbMainGlobalParams *sgpp;
-
+
sgpp = fw->sgpp;
if (sgpp == NULL)
{
return;
}
-
+
if(fw->stb_elem_refptr)
{
if(gap_story_elem_is_video(fw->stb_elem_refptr))
@@ -1554,14 +1554,14 @@
* is NOT its main section, the active section of the original
* is copied as main section to the duplicate for playback.
* (additional the mask_section is also included in the duplicate)
- *
+ *
* playback is limited to simple clips of the current video track
* in case a valid (positive) vtrack number is specified.
* (this allows quick direct frame fetch operations without
* the use of the storyboard render processor engine,
* VID_PLAY_SECTION elemnts are rendered as black frames in this
* playback mode)
- *
+ *
* a negative vtrack number (-1) triggers composite video playback
* where the storyboard render processor engine is used.
*/
@@ -1606,9 +1606,9 @@
sgpp->in_player_call = TRUE;
gap_story_vthumb_close_videofile(sgpp);
-
+
player_stb_in_track = stb_in_track;
-
+
stb_dup = NULL;
if(stb)
{
@@ -1664,7 +1664,7 @@
*/
gap_story_copy_sub_sections(stb, stb_dup);
}
-
+
/* create selection mapping from source storyboard stb
* and attach the mapping to the duplicate.
* Note that the duplicate must contain all clips of the active section
@@ -1675,19 +1675,19 @@
gap_story_create_new_mapping_from_selection(
stb->active_section
, MAX(1, stb_in_track));
-
+
//if(gap_debug)
{
gap_story_debug_print_mapping(stb_dup->mapping);
fflush(stdout);
}
-
+
}
else
{
/* here we handle storyboard playback of selected clips
* in the current videotrack of the active_section.
- * (the player will not use the render processor,
+ * (the player will not use the render processor,
* and will be much faster in this mode.
* playback of sub section references is not supported in this case.)
*/
@@ -1695,14 +1695,14 @@
gap_story_enable_hidden_maskdefinitions(stb_dup);
}
-
+
}
if(stb_dup)
{
GapStorySection *dup_main_section;
-
+
if(gap_debug)
{
printf("p_story_call_player: The duplicated storyboard list:");
@@ -1710,7 +1710,7 @@
printf("==========###########========\n\n END of The duplicated storyboard list:\n");
fflush(stdout);
}
-
+
if(TRUE == p_is_debug_feature_item_enabled("save_stb_duplicate_on_call_player"))
{
/* debug feature: save the storyboard duplicate that will be passed
@@ -1954,20 +1954,20 @@
GapStorySection *section;
gint32 l_rowpage;
gint32 l_page;
-
+
section =
gap_story_find_section_by_name(stb, stb->edit_settings->section_name);
if (section == NULL)
{
section = gap_story_find_main_section(stb);
}
-
+
stb->active_section = section;
tabw->vtrack = CLAMP(stb->edit_settings->track, 0, GAP_STB_MAX_VID_TRACKS);
l_rowpage = 1;
l_page = MAX(1, stb->edit_settings->page);
- /* restore scroll position, recalculate the page
+ /* restore scroll position, recalculate the page
* (that reprensents the scroll position)
* if(stb->layout_cols > 0) { tabw->cols = stb->layout_cols; }
* if(stb->layout_rows > 0) { tabw->rows = stb->layout_rows; }
@@ -1983,7 +1983,7 @@
&& (stb->layout_cols > 1))
{
gdouble new_page;
-
+
/* convert the page to current column layout */
new_page = (gdouble)(l_page -1) * (gdouble)stb->layout_cols / (gdouble)tabw->cols;
l_page = 1 + new_page;
@@ -1999,8 +1999,8 @@
gtk_adjustment_set_value(GTK_ADJUSTMENT(tabw->vtrack_spinbutton_adj)
, tabw->vtrack);
-
-
+
+
}
} /* end p_restore_edit_settings */
@@ -2014,7 +2014,7 @@
p_tabw_process_undo(GapStbTabWidgets *tabw)
{
GapStoryBoard *stb;
-
+
stb = gap_stb_undo_pop(tabw);
if (stb)
{
@@ -2030,7 +2030,7 @@
p_tabw_process_redo(GapStbTabWidgets *tabw)
{
GapStoryBoard *stb;
-
+
stb = gap_stb_undo_redo(tabw);
if (stb)
{
@@ -2057,7 +2057,7 @@
GapStoryBoard *old_stb;
GapStbMainGlobalParams *sgpp;
gint32 target_rowpage;
-
+
if ((tabw == NULL) || (stb == NULL))
{
return;
@@ -2118,23 +2118,23 @@
,(float)GTK_ADJUSTMENT(tabw->rowpage_spinbutton_adj)->value
);
}
-
+
/* update the hidden rowpage_spinbutton widget
* to target_rowpage value.
*/
{
gint32 rowpage_spinbutton_value;
-
+
rowpage_spinbutton_value = GTK_ADJUSTMENT(tabw->rowpage_spinbutton_adj)->value;
if(rowpage_spinbutton_value != target_rowpage)
{
gtk_adjustment_set_value(GTK_ADJUSTMENT(tabw->rowpage_spinbutton_adj)
, (gdouble)target_rowpage);
}
-
+
}
-
+
gap_story_dlg_tabw_undo_redo_sensitivity(tabw);
} /* end p_tabw_replace_storyboard_and_widgets */
@@ -2245,9 +2245,9 @@
{
play_all = FALSE;
stb_composite = FALSE;
-
+
tabw = sgpp->cll_widgets;
-
+
stb_in_track = 1;
if(tabw)
{
@@ -2320,9 +2320,9 @@
{
play_all = FALSE;
stb_composite = FALSE;
-
+
tabw = sgpp->stb_widgets;
-
+
stb_in_track = 1;
if(tabw)
{
@@ -2458,7 +2458,7 @@
{
sgpp->cancel_video_api = TRUE;
sgpp->auto_vthumb_refresh_canceled = TRUE;
-
+
p_reset_progress_bars(sgpp);
if(sgpp->vthumb_prefetch_in_progress == GAP_VTHUMB_PREFETCH_NOT_ACTIVE)
@@ -2533,14 +2533,14 @@
GapStoryElem *stb_elem;
GapStorySection *referable_section;
gint32 l_nframes;
-
+
if(gap_debug) printf("p_tabw_add_section_elem\n");
if(sgpp == NULL) { return; }
if(tabw == NULL) { return; }
if(stb_dst == NULL) { return; }
if(stb_dst->active_section == NULL) { return; }
-
+
referable_section = gap_story_find_first_referable_subsection(stb_dst);
if(referable_section == NULL) { return; }
@@ -2557,7 +2557,7 @@
{
gap_stb_undo_group_begin(tabw);
gap_stb_undo_push(tabw, GAP_STB_FEATURE_CREATE_SECTION_CLIP);
-
+
gap_story_list_append_elem(stb_dst, stb_elem);
/* refresh storyboard layout and thumbnail list widgets */
@@ -2677,7 +2677,7 @@
if (tabw == NULL) { return; }
if (tabw->sgpp == NULL) { return; }
-
+
stb_dst = p_tabw_get_stb_ptr(tabw);
if(stb_dst != NULL)
@@ -2783,7 +2783,7 @@
*/
sgpp->vthumb_prefetch_in_progress = GAP_VTHUMB_PREFETCH_PENDING;
}
-
+
/* (re)load storyboard from new filename */
if(tabw->type == GAP_STB_MASTER_TYPE_STORYBOARD)
{
@@ -2803,7 +2803,7 @@
{
sgpp->vthumb_prefetch_in_progress = GAP_VTHUMB_PREFETCH_NOT_ACTIVE;
}
-
+
}
@@ -3087,7 +3087,7 @@
if(tabw->sections_combo == NULL) {return;}
active_index = gtk_combo_box_get_active(GTK_COMBO_BOX (tabw->sections_combo));
-
+
if(gap_debug)
{
printf("SECTION COMBO index set to: %d\n", (int)active_index);
@@ -3179,7 +3179,7 @@
* but only in case where the tabw->rowpage_spinbutton widget is NOT hidden !)
*/
gtk_adjustment_set_value(GTK_ADJUSTMENT(tabw->rowpage_spinbutton_adj), (gdouble)value);
-
+
/* if the tabw->rowpage_spinbutton widget is hidden
* the tabw->rowpage does NOT change to desired value.
* in this case we must trigger the update explicitely.
@@ -3251,7 +3251,7 @@
imageheight = tabw->thumb_height;
aspect_ratio = GAP_PLAYER_DONT_FORCE_ASPECT;
-
+
if((sgpp->force_stb_aspect) && (pw->stb_refptr))
{
aspect_ratio = gap_story_adjust_size_respecting_aspect(pw->stb_refptr
@@ -3315,7 +3315,7 @@
printf("gap_story_pw_composite_playback: START\n");
gap_story_debug_print_list(stb_duptrack);
}
-
+
if(sgpp->force_stb_aspect)
{
aspect_ratio = gap_story_get_master_size_respecting_aspect(stb_duptrack
@@ -3328,7 +3328,7 @@
, &imagewidth
, &imageheight);
}
-
+
begin_frame = gap_story_get_framenr_by_story_id(pw->stb_refptr->active_section
, pw->stb_elem_refptr->story_id
, pw->stb_elem_refptr->track);
@@ -3378,10 +3378,10 @@
gint32 imagewidth;
gint32 imageheight;
gdouble aspect_ratio;
-
+
stb_duptrack = gap_story_duplicate_vtrack(attw->stb_refptr
, attw->stb_elem_refptr->track);
-
+
if(sgpp->force_stb_aspect)
{
aspect_ratio = gap_story_get_master_size_respecting_aspect(stb_duptrack
@@ -3452,19 +3452,19 @@
aspect_ratio = gap_story_adjust_size_respecting_aspect(fw->stb_refptr
, &imagewidth, &imageheight);
}
-
+
if((fw->stb_elem_refptr->record_type == GAP_STBREC_VID_SECTION)
|| (fw->stb_elem_refptr->record_type == GAP_STBREC_VID_BLACKSECTION))
{
gint32 stb_in_track;
-
- /* select the secetion clip
+
+ /* select the secetion clip
* (because section playback is only possible in composite
* mode (using the storyboard render processor)
* an composite playback operates on mapping for selected clips)
*/
p_selection_replace(fw);
-
+
stb_in_track = tabw->vtrack;
p_story_call_player(sgpp
,fw->stb_refptr
@@ -3508,7 +3508,7 @@
);
g_free(imagename);
}
-
+
}
}
@@ -3550,7 +3550,7 @@
{
case GDK_2BUTTON_PRESS:
if(gap_debug) printf("p_frame_widget_preview_events_cb GDK_2BUTTON_PRESS (doubleclick)\n");
-
+
if (event->button.state & GDK_CONTROL_MASK)
{
/* additional call external image viewer */
@@ -3688,7 +3688,7 @@
GapStoryBoard *stb;
GapStbTabWidgets *tabw;
gint target_active_index;
-
+
if(gap_debug)
{
printf("gap_story_dlg_spw_refresh START\n");
@@ -3698,7 +3698,7 @@
if(spw->tabw == NULL) { return; }
tabw = spw->tabw;
-
+
stb = spw->stb_refptr;
if(stb == NULL) { return; }
@@ -3727,7 +3727,7 @@
printf(" target_active_index: %d\n", target_active_index);
}
-
+
if(tabw->sections_combo != NULL)
{
gtk_combo_box_set_active(GTK_COMBO_BOX (tabw->sections_combo)
@@ -3771,7 +3771,7 @@
{
GapStoryElem *stb_elem;
GapStorySection *active_section;
-
+
active_section = stb->active_section;
if (active_section != NULL)
@@ -3852,7 +3852,7 @@
{
GapStoryElem *stb_elem;
GapStorySection *active_section;
-
+
active_section = stb->active_section;
if (active_section != NULL)
@@ -3925,7 +3925,7 @@
tabw->spw->spw_prop_dialog = NULL;
}
}
-
+
} /* end p_tabw_destroy_all_popup_dlg */
@@ -4011,7 +4011,7 @@
{
gap_stb_undo_group_begin(tabw);
gap_stb_undo_push(tabw, GAP_STB_FEATURE_EDIT_CUT);
-
+
sgpp->curr_selection = gap_story_duplicate_sel_only(stb_dst, tabw->vtrack);
gap_story_remove_sel_elems(stb_dst);
@@ -4093,7 +4093,7 @@
{
gap_stb_undo_group_begin(tabw);
gap_stb_undo_push(tabw, GAP_STB_FEATURE_EDIT_PASTE);
-
+
story_id = gap_story_find_last_selected_in_track(stb_dst->active_section, tabw->vtrack);
if(story_id < 0)
{
@@ -4437,7 +4437,7 @@
if(sgpp->curr_selection)
{
GapStorySection *curr_selection_main_section;
-
+
curr_selection_main_section = gap_story_find_main_section(sgpp->curr_selection);
if(curr_selection_main_section)
@@ -4514,7 +4514,7 @@
if ((tabw->vtrack_spinbutton) && (tabw->vtrack_spinbutton_adj))
{
- gtk_widget_set_sensitive(tabw->vtrack_spinbutton, l_sensitive);
+ gtk_widget_set_sensitive(tabw->vtrack_spinbutton, l_sensitive);
GTK_ADJUSTMENT(tabw->vtrack_spinbutton_adj)->lower = l_lower_limit;
GTK_ADJUSTMENT(tabw->vtrack_spinbutton_adj)->upper = l_upper_limit;
}
@@ -4531,7 +4531,7 @@
gboolean l_sensitive;
const char *undo_feature;
char *tooltip_help;
-
+
l_sensitive = FALSE;
tooltip_help = NULL;
undo_feature = gap_stb_undo_get_undo_feature(tabw);
@@ -4544,7 +4544,7 @@
{
tooltip_help = g_strdup(_("UNDO"));
}
-
+
if (menu_item)
{
gtk_widget_set_sensitive(menu_item, l_sensitive);
@@ -4556,7 +4556,7 @@
}
g_free(tooltip_help);
-
+
} /* end p_tabw_set_undo_sensitivity */
@@ -4570,7 +4570,7 @@
gboolean l_sensitive;
const char *redo_feature;
char *tooltip_help;
-
+
l_sensitive = FALSE;
tooltip_help = NULL;
redo_feature = gap_stb_undo_get_redo_feature(tabw);
@@ -4583,7 +4583,7 @@
{
tooltip_help = g_strdup(_("REDO"));
}
-
+
if (menu_item)
{
gtk_widget_set_sensitive(menu_item, l_sensitive);
@@ -4673,14 +4673,14 @@
}
}
}
-
+
}
l_sensitive_att = l_sensitive_add;
if(sgpp->cll_widgets->vtrack == GAP_STB_MASK_TRACK_NUMBER)
{
l_sensitive_att = FALSE;
}
-
+
if(sgpp->menu_item_cll_save) gtk_widget_set_sensitive(sgpp->menu_item_cll_save, l_sensitive);
if(sgpp->menu_item_cll_save_as) gtk_widget_set_sensitive(sgpp->menu_item_cll_save_as, l_sensitive);
if(sgpp->menu_item_cll_playback) gtk_widget_set_sensitive(sgpp->menu_item_cll_playback, l_sensitive);
@@ -4697,7 +4697,7 @@
if(sgpp->menu_item_cll_add_section_clip)
{
l_sensitive_add_section = l_sensitive_add;
-
+
if(NULL == (gap_story_find_first_referable_subsection(sgpp->cll)))
{
l_sensitive_add_section = FALSE;
@@ -4755,7 +4755,7 @@
{
l_sensitive_add_section = FALSE;
}
-
+
gtk_widget_set_sensitive(sgpp->menu_item_stb_add_section_clip, l_sensitive_add_section);
}
@@ -4767,7 +4767,7 @@
p_undo_redo_sensibility(sgpp);
gap_lib_check_tooltips(NULL);
-
+
} /* end p_widget_sensibility */
@@ -4853,7 +4853,7 @@
g_strdup(stb->active_section->section_name);
}
}
-
+
if(tabw != NULL)
{
stb->edit_settings->track = tabw->vtrack;
@@ -4940,9 +4940,9 @@
gint l_stb_thumbsize_idx;
gint l_stb_aspect_idx;
gboolean l_rc;
-
+
gboolean old_force_stb_aspect;
-
+
@@ -5069,7 +5069,7 @@
cll_thumbsize = p_index_to_thumbsize(argv[l_cll_thumbsize_idx].radio_ret);
stb_thumbsize = p_index_to_thumbsize(argv[l_stb_thumbsize_idx].radio_ret);
-
+
sgpp->force_stb_aspect = (argv[l_stb_aspect_idx].int_ret != 0);
if((sgpp->cll_thumbsize != cll_thumbsize)
@@ -5192,7 +5192,7 @@
/* ---------------------------------
* p_menu_win_debug_log_to_stdout_cb
* ---------------------------------
- * check
+ * check
*/
static void
p_menu_win_debug_log_to_stdout_cb (GtkWidget *widget, GapStbMainGlobalParams *sgpp)
@@ -5200,7 +5200,7 @@
if(sgpp)
{
gboolean selection_found;
-
+
selection_found = FALSE;
printf("\n\nDEBUG LOG_MENU START\n");
if(TRUE == p_is_debug_feature_item_enabled("dump_vthumb_list"))
@@ -5233,7 +5233,7 @@
printf("\ndump_undostack_stroryboard enabled\n");
gap_stb_undo_debug_print_stack(sgpp->stb_widgets);
}
-
+
if (selection_found != TRUE)
{
printf("INFO p_menu_win_debug_log_to_stdout_cb:"
@@ -5241,7 +5241,7 @@
"any valid selction what to print for debug purpose.\n"
, GAP_DEBUG_STORYBOARD_CONFIG_FILE);
}
-
+
printf("\n\nDEBUG LOG_MENU END\n");
fflush(stdout);
}
@@ -5463,7 +5463,7 @@
if(gap_debug) printf("p_menu_cll_undo_cb\n");
p_tabw_process_undo(sgpp->cll_widgets);
-
+
} /* end p_menu_cll_undo_cb */
/* -----------------------------
@@ -5476,7 +5476,7 @@
if(gap_debug) printf("p_menu_cll_redo_cb\n");
p_tabw_process_redo(sgpp->cll_widgets);
-
+
} /* end p_menu_cll_redo_cb */
@@ -5721,7 +5721,7 @@
if(gap_debug) printf("p_menu_stb_undo_cb\n");
p_tabw_process_undo(sgpp->stb_widgets);
-
+
} /* end p_menu_stb_undo_cb */
/* -----------------------------
@@ -5734,7 +5734,7 @@
if(gap_debug) printf("p_menu_stb_undo_cb\n");
p_tabw_process_redo(sgpp->stb_widgets);
-
+
} /* end p_menu_stb_redo_cb */
@@ -6576,7 +6576,7 @@
);
if(sgpp->progress_bar_master)
{
-
+
msg = g_strdup_printf(_("Fetching videothumbnail for clip: %d (out of %d)")
,(int)l_count
,(int)l_total
@@ -6597,7 +6597,7 @@
{
printf("p_prefetch_vthumbs: prefetch PROGRESS interrupt occured\n");
}
-
+
/* stop current prefetch of (possibly outdated) storyboard
*/
p_reset_progress_bars(sgpp);
@@ -6637,19 +6637,19 @@
{
stb = gap_story_board_duplicate_distinct_sorted(stb, sgpp->stb);
}
-
+
if((sgpp->cll_widgets) && (sgpp->cll))
{
stb = gap_story_board_duplicate_distinct_sorted(stb, sgpp->cll);
}
-
+
if(stb == NULL)
{
return;
}
/* gap_story_save(stb, "zz_STB_distinct_sort.txt"); */ /* for test only */
-
+
/* operate on a copy that includes elements of both (stb + cll) storyboards
* this merged copy has groups of same resources sorted by start frame numbers
* (to mimimize both video open operations and frame seek times)
@@ -6696,7 +6696,7 @@
{
p_optimized_prefetch_vthumbs_worker(sgpp);
/*
- * - one option is to render default icon, and restart the prefetch
+ * - one option is to render default icon, and restart the prefetch
* via GAP_VTHUMB_PREFETCH_RESTART_REQUEST
* (because the storyboard may have changed since prefetch was started
* note that prefetch will be very quick for all clips where vthumb is already present
@@ -6774,7 +6774,7 @@
recreateRequired = FALSE;
}
}
-
+
} /* end p_optimized_prefetch_vthumbs */
@@ -6998,7 +6998,7 @@
GapStbMainGlobalParams *sgpp;
dialog = NULL;
-
+
if(sgpp_1 != NULL)
{
sgpp = sgpp_1;
@@ -7007,8 +7007,8 @@
{
sgpp = (GapStbMainGlobalParams *)g_object_get_data(G_OBJECT(widget), "sgpp");
}
-
-
+
+
if(sgpp)
{
gap_story_vthumb_close_videofile(sgpp);
@@ -7317,13 +7317,13 @@
if(tabw->sections_combo == NULL) {return;}
stb_dst = p_tabw_get_stb_ptr(tabw);
-
+
if (stb_dst)
{
GapStorySection *section;
-
+
section = p_find_section_by_active_index(stb_dst, target_index);
-
+
if (gap_debug)
{
if (section == NULL)
@@ -7349,24 +7349,24 @@
}
}
}
-
-
+
+
if ((section != stb_dst->active_section)
&& (section != NULL))
{
gint32 current_vtrack;
current_vtrack = gap_story_get_current_vtrack(stb_dst, section);
-
+
stb_dst->active_section = section;
p_tabw_sensibility(tabw->sgpp, stb_dst, tabw);
-
+
/* fake -99 as current video track to force always refresh
* in p_vtrack_spinbutton_cb
*/
tabw->vtrack = -99;
-
+
gtk_adjustment_set_value(GTK_ADJUSTMENT(tabw->vtrack_spinbutton_adj)
, current_vtrack);
@@ -7378,7 +7378,7 @@
* did not change. (but same track number in another section requires
* always a refresh, that is triggered here)
*/
- p_vtrack_spinbutton_cb(NULL, tabw);
+ p_vtrack_spinbutton_cb(NULL, tabw);
}
}
else
@@ -7386,7 +7386,7 @@
p_tabw_sensibility(tabw->sgpp, stb_dst, tabw);
}
}
-
+
} /* end p_activate_section_by_combo_index */
/* ---------------------------------
@@ -7420,7 +7420,7 @@
index_of_active_item = 0;
tabw->sections_combo_elem_count = 0;
- /* always add the entries for main and mask section */
+ /* always add the entries for main and mask section */
gtk_combo_box_append_text(GTK_COMBO_BOX (tabw->sections_combo)
,_("MAIN"));
tabw->sections_combo_elem_count++;
@@ -7454,19 +7454,19 @@
else
{
gchar *l_txt;
-
+
if(section == stb->active_section)
{
index_of_active_item = index;
}
-
+
l_txt = gap_lib_shorten_filename(NULL /* prefix */
,section->section_name /* filenamepart */
,NULL /* suffix */
,12 /* max_chars */
);
-
-
+
+
gtk_combo_box_append_text(GTK_COMBO_BOX (tabw->sections_combo)
, l_txt);
g_free(l_txt);
@@ -7585,9 +7585,9 @@
tabw->sections_combo = combo;
gtk_box_pack_start (GTK_BOX (hbox2), combo, FALSE, FALSE, 2);
gtk_widget_show (combo);
-
+
p_set_strings_for_section_combo(tabw);
-
+
g_signal_connect (G_OBJECT (combo), "changed",
G_CALLBACK (p_section_combo_changed_cb),
tabw);
@@ -7614,7 +7614,7 @@
spinbutton_adj = gtk_adjustment_new ( tabw->vtrack
, 0 /* min */
, GAP_STB_MAX_VID_TRACKS -1 /* max */
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
tabw->vtrack_spinbutton_adj = spinbutton_adj;
tabw->vtrack_spinbutton = spinbutton;
@@ -7746,7 +7746,7 @@
spinbutton_adj = gtk_adjustment_new ( tabw->rowpage
, 1 /* min */
, 1 /* max */
- , 1, 10, 10);
+ , 1, 10, 0);
tabw->rowpage_spinbutton_adj = spinbutton_adj;
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
gtk_widget_hide (spinbutton);
@@ -7773,7 +7773,7 @@
adj = gtk_adjustment_new ( tabw->rowpage
, 1 /* min */
, 1 /* max */
- , 1, 10, 10);
+ , 1, 10, 0);
vscale = gtk_vscrollbar_new (GTK_ADJUSTMENT(adj));
gtk_range_set_update_policy (GTK_RANGE (vscale), GTK_UPDATE_DELAYED); /* GTK_UPDATE_CONTINUOUS */
@@ -7818,12 +7818,12 @@
GtkWidget *image;
image = gtk_image_new_from_stock (stock_id,
GTK_ICON_SIZE_BUTTON);
-
+
gtk_widget_show (image);
button = gtk_button_new();
gtk_container_add (GTK_CONTAINER (button), image);
return(button);
-
+
} /* end p_gtk_button_new_from_stock_icon */
@@ -7839,7 +7839,7 @@
{
char *value_string;
gint32 value;
-
+
value = default_value;
value_string = gimp_gimprc_query(gimprc_option_name);
@@ -7847,9 +7847,9 @@
{
value = atol(value_string);
g_free(value_string);
- }
+ }
return (CLAMP(value, min_value, max_value));
-
+
} /* end p_get_gimprc_int_value */
@@ -7863,7 +7863,7 @@
{
char *value_string;
gboolean value;
-
+
value = default_value;
value_string = gimp_gimprc_query(gimprc_option_name);
@@ -7875,9 +7875,9 @@
value = FALSE;
}
g_free(value_string);
- }
+ }
return (value);
-
+
} /* end p_get_gimprc_gboolean_value */
/* ---------------------------------
@@ -7955,7 +7955,7 @@
default:
value_string = g_strdup_printf("%d", preview_size);
break;
-
+
}
gimp_gimprc_set(gimprc_option_name, value_string);
g_free(value_string);
@@ -8009,9 +8009,9 @@
p_save_gimprc_preview_size("video-storyboard-thumbnail_size", sgpp->stb_thumbsize);
p_save_gimprc_int_value("video-storyboard-columns", sgpp->stb_cols);
p_save_gimprc_int_value("video-storyboard-rows", sgpp->stb_rows);
-
+
p_save_gimprc_gboolean_value("video-storyboard-force-aspect-playback", sgpp->force_stb_aspect);
-
+
} /* end p_save_gimprc_layout_settings */
@@ -8039,7 +8039,7 @@
sgpp->stb_cols = p_get_gimprc_int_value("video-storyboard-columns"
, sgpp->stb_cols
, STB_MIN_COL
- , STB_MAX_COL
+ , STB_MAX_COL
);
sgpp->stb_rows = p_get_gimprc_int_value("video-storyboard-rows"
, sgpp->stb_rows
@@ -8445,8 +8445,8 @@
{
gint32 ffetch_user_id;
-
- /* register for frame fetcher resources (image cache)
+
+ /* register for frame fetcher resources (image cache)
*/
ffetch_user_id = gap_frame_fetch_register_user("gap_storyboard_dialog");
@@ -8557,7 +8557,7 @@
gap_stb_undo_group_begin(tabw);
gap_stb_undo_push(tabw, GAP_STB_FEATURE_GENERATE_OTONE);
-
+
/* start otone generator procedure */
l_ok = gap_story_gen_otone_audio(stb_dst
,vid_track
@@ -8567,7 +8567,7 @@
,&l_first_non_matching_framerate
);
gap_stb_undo_group_end(tabw);
-
+
if(!l_ok)
{
g_message(_("Original tone track was not created.\n"
@@ -8670,7 +8670,7 @@
}
h_ptr++;
}
-
+
} /* end p_parse_aspect_width_and_height */
/* -----------------------------------
@@ -8825,7 +8825,7 @@
{
l_aspect_idx = 2;
}
-
+
if((stb_dst->master_aspect_width != 0)
&& (stb_dst->master_aspect_height != 0))
{
@@ -8836,7 +8836,7 @@
, (int)stb_dst->master_aspect_height
);
}
-
+
gap_arr_arg_init(&argv[l_ii], GAP_ARR_WGT_OPT_ENTRY);
argv[l_ii].label_txt = _("Aspect:");
argv[l_ii].help_txt = _("Select video frame aspect ratio; "
@@ -8974,10 +8974,10 @@
GapStoryBoard *stb_dup;
gap_stb_undo_push(tabw, GAP_STB_FEATURE_PROPERTIES_MASTER);
-
+
stb_dup = gap_story_duplicate_active_and_mask_section(stb_dst);
-
+
stb_dst->master_width = (gint32)(argv[l_ii_width].int_ret);
stb_dst->master_height = (gint32)(argv[l_ii_height].int_ret);
stb_dst->master_framerate = (gint32)(argv[l_ii_framerate].flt_ret);
@@ -9000,7 +9000,7 @@
printf("master_aspect_width: %d\n", (int)stb_dst->master_aspect_width );
printf("master_aspect_height: %d\n", (int)stb_dst->master_aspect_height );
}
-
+
stb_dst->master_samplerate = (gint32)(argv[l_ii_samplerate].int_ret);
stb_dst->master_volume = (gint32)(argv[l_ii_volume].flt_ret);
if(*buf_preferred_decoder)
@@ -9349,7 +9349,7 @@
gap_stb_undo_group_begin(tabw);
gap_stb_undo_push(tabw, GAP_STB_FEATURE_DND_PASTE);
-
+
/* insert into destination list via standard paste operation */
p_tabw_edit_paste_at_story_id (sgpp
, stb_dst
@@ -9358,7 +9358,7 @@
, insert_after
);
gap_stb_undo_group_end(tabw);
-
+
if ((info == GAP_STB_TARGET_STORYBOARD_ELEM)
&& (context->action == GDK_ACTION_MOVE)
&& (tabw_src != NULL)
@@ -9370,14 +9370,14 @@
*/
gap_stb_undo_group_begin(tabw_src);
gap_stb_undo_push(tabw_src, GAP_STB_FEATURE_DND_CUT);
-
+
gap_story_selection_from_ref_list_orig_ids(
stb_src
, TRUE /* sel_state */
, sgpp->curr_selection
);
p_tabw_edit_cut_cb(widget, tabw_src);
-
+
gap_stb_undo_group_end(tabw_src);
}
}
@@ -9549,7 +9549,7 @@
if(list_root)
{
GapStorySection *stb_dnd_main_section;
-
+
stb_dnd = gap_story_new_story_board("StoryboardDND");
stb_dnd_main_section = gap_story_find_main_section(stb_dnd);
stb_dnd_main_section->stb_elem = list_root;
@@ -9818,15 +9818,15 @@
{
static char *defaultExternalImageViewer = "eog";
char *value_string;
-
+
value_string = gimp_gimprc_query("video_external_image_viewer");
if(value_string)
{
return(value_string);
- }
-
+ }
+
return g_strdup(defaultExternalImageViewer);
-
+
} /* end p_get_external_image_viewer */
@@ -9861,8 +9861,8 @@
{
char *externalImageViewerCall;
char *externalImageViewer;
-
-
+
+
imagename = gap_story_get_filename_from_elem(fw->stb_elem_refptr);
externalImageViewer = p_get_external_image_viewer();
externalImageViewerCall = g_strdup_printf("%s %s &"
@@ -9870,11 +9870,11 @@
,imagename
);
system(externalImageViewerCall);
-
+
g_free(externalImageViewerCall);
g_free(imagename);
}
-
+
}
}
Modified: trunk/gap/gap_vex_dialog.c
==============================================================================
--- trunk/gap/gap_vex_dialog.c (original)
+++ trunk/gap/gap_vex_dialog.c Tue Jan 20 16:47:26 2009
@@ -74,7 +74,7 @@
, gint32 seltrack
, gdouble delace
, gboolean docked_mode
- );
+ );
static void p_vex_set_range_cb(GapPlayerAddClip *plac_ptr);
static void p_check_videofile(GapVexMainGlobalParams *gpp);
@@ -201,7 +201,7 @@
gpp->in_player_call = FALSE;
gpp->video_width = 320;
gpp->video_height = 200;
-
+
gpp->val.image_ID = -1;
} /* end gap_vex_dlg_init_gpp */
@@ -232,7 +232,7 @@
{
gchar *msg;
gint l_rc;
-
+
l_argv[0].but_txt = _("Overwrite File");
l_argv[0].but_val = 0;
l_argv[1].but_txt = _("Overwrite All");
@@ -242,7 +242,7 @@
gap_arr_arg_init(&argv[0], GAP_ARR_WGT_LABEL);
argv[0].label_txt = filename;
-
+
msg = g_strdup_printf(_("File: %s already exists"), filename);
l_rc = gap_arr_std_dialog ( _("Overwrite")
, msg
@@ -289,7 +289,7 @@
p_update_time_labels (GapVexMainGlobalParams *gpp)
{
if(gpp == NULL) return;
-
+
if(!gpp->val.chk_is_compatible_videofile)
{
gtk_label_set_text ( GTK_LABEL(gpp->mw__begin_time_label), TIME_UNDEF_STRING);
@@ -369,7 +369,7 @@
{
sensitive = FALSE;
}
-
+
gtk_widget_set_sensitive(gpp->mw__spinbutton_begin_frame, sensitive);
gtk_widget_set_sensitive(gpp->mw__spinbutton_end_frame, sensitive);
gtk_widget_set_sensitive(gpp->mw__button_vrange_dialog, sensitive);
@@ -389,7 +389,7 @@
sensitive = FALSE;
}
sensitive_vid = sensitive;
-
+
gtk_widget_set_sensitive(gpp->mw__spinbutton_basenum, sensitive);
gtk_widget_set_sensitive(gpp->mw__combo_deinterlace, sensitive);
gtk_widget_set_sensitive(gpp->mw__checkbutton_multilayer, sensitive);
@@ -529,7 +529,7 @@
printf(" FROM : %d\n", (int)plac_ptr->range_from);
printf(" TO : %d\n", (int)plac_ptr->range_to);
}
-
+
if(gpp == NULL)
{
return;
@@ -538,7 +538,7 @@
gpp->val.begin_frame = MIN(plac_ptr->range_from, plac_ptr->range_to);
gpp->val.end_frame = MAX(plac_ptr->range_from, plac_ptr->range_to);
p_update_range_widgets(gpp);
-
+
} /* end p_vex_set_range_cb */
@@ -551,12 +551,12 @@
* IN: end_frame use -1 to start play until last frame
*
* Call the Player
- * If it is the 1.st call or the player window has closed since last call
+ * If it is the 1.st call or the player window has closed since last call
* create the player widget
- * else
+ * else
* reset the player widget
*/
-static void
+static void
p_call_player_widget(GapVexMainGlobalParams *gpp
, char *imagename
, gint32 imagewidth
@@ -577,8 +577,8 @@
}
gpp->in_player_call = TRUE;
-
-
+
+
if(gpp->plp)
{
if(gpp->plp->shell_window != NULL)
@@ -586,7 +586,7 @@
gtk_window_present(GTK_WINDOW(gpp->plp->shell_window));
}
- if((gpp->plp->shell_window == NULL)
+ if((gpp->plp->shell_window == NULL)
&& (gpp->plp->docking_container == NULL))
{
if(gap_debug) printf("Player shell has gone, force Reopen now\n");
@@ -650,7 +650,7 @@
gpp->plp->force_open_as_video = TRUE; /* TRUE: try video open even for unknown videofile extensions */
gpp->plp->have_progress_bar = TRUE;
-
+
gap_player_dlg_create(gpp->plp);
}
@@ -677,10 +677,10 @@
, 1 /* stb_in_track */
);
}
-
+
if(gpp->plp)
{
- if((gpp->plp->from_button)
+ if((gpp->plp->from_button)
&& (gpp->plp->to_button))
{
gimp_help_set_help_data (gpp->plp->from_button
@@ -703,26 +703,26 @@
p_check_aspect(gdouble aspect_ratio, gint width, gint height)
{
gdouble w_div_h;
-
+
if(height)
{
w_div_h = (gdouble)width / (gdouble)height;
-
+
if ((aspect_ratio <= w_div_h + 0.001)
&& (aspect_ratio >= w_div_h - 0.001))
{
return(TRUE);
}
}
-
+
return (FALSE);
} /* end p_check_aspect */
-
+
/* -------------------
* p_check_videofile
* -------------------
- * check videofile compatibility
+ * check videofile compatibility
* and get some information about the file
*/
static void
@@ -738,7 +738,7 @@
gpp->val.chk_atracks = 0;
gpp->val.chk_total_frames = 0;
aspect_ratio = 0;
-
+
active_decoder = NULL;
if(g_file_test(gpp->val.videoname, G_FILE_TEST_EXISTS))
@@ -761,7 +761,7 @@
gpp->video_height = gvahand->height;
gpp->video_speed = gvahand->framerate;
aspect_ratio = gvahand->aspect_ratio;
-
+
if(gvahand->dec_elem)
{
@@ -776,7 +776,7 @@
/* if(dec_elem->decoder_description) */
}
-
+
GVA_close(gvahand);
}
}
@@ -807,7 +807,7 @@
, (float)aspect_ratio
, ratio2_txt
);
-
+
gtk_label_set_text(lbl, ratio_txt);
}
else
@@ -830,7 +830,7 @@
}
p_update_wgt_sensitivity(gpp);
-
+
} /* end p_check_videofile */
@@ -1417,8 +1417,8 @@
delace = GAP_VEX_DELACE_EVEN;
}
delace += CLAMP(gpp->val.delace_threshold, 0.0, 0.9999);
-
-
+
+
if(gap_debug) printf("CB: on_mw__button_vrange_dialog_clicked\n");
if(gpp == NULL) return;
@@ -1464,8 +1464,8 @@
delace = GAP_VEX_DELACE_EVEN;
}
delace += CLAMP(gpp->val.delace_threshold, 0.0, 0.9999);
-
-
+
+
if(gap_debug) printf("CB: on_mw__button_vrange_docked_clicked\n");
if(gpp == NULL) return;
@@ -1902,12 +1902,12 @@
} /* end create_fsa__fileselection */
/* endif GAP_ENABLE_VIDEOAPI_SUPPORT (1) */
-#endif
+#endif
/* ----------------------------------
* p_align_widget_columns
* ----------------------------------
- * IN: array of pointers to widgets
+ * IN: array of pointers to widgets
* (the array contains widgets that are arranged in one column
* but do not belong to the same table)
* this procedure does check for the max width of all those widgets,
@@ -2041,7 +2041,7 @@
gtk_widget_show (mw__main_hbox);
gtk_box_pack_start (GTK_BOX (mw__dialog_vbox1), mw__main_hbox, TRUE, TRUE, 5);
-
+
mw__vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (mw__vbox1);
gtk_box_pack_start (GTK_BOX (mw__main_hbox), mw__vbox1, TRUE, TRUE, 10);
@@ -2084,9 +2084,9 @@
/* the videofile label */
mw__label_video = gtk_label_new (_("Videofilename:"));
- lbl_array[lbl_idx] = mw__label_video;
+ lbl_array[lbl_idx] = mw__label_video;
lbl_idx++;
-
+
gtk_widget_show (mw__label_video);
gtk_misc_set_alignment (GTK_MISC (mw__label_video), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (mw__table_in), mw__label_video, 0, 1, in_row, in_row+1,
@@ -2107,7 +2107,7 @@
/* the videofile button (that invokes fileselection dialog) */
mw__button_video = gtk_button_new_with_label (_("..."));
gtk_widget_show (mw__button_video);
- wgt_array[wgt_idx] = mw__button_video;
+ wgt_array[wgt_idx] = mw__button_video;
wgt_idx++;
gtk_table_attach (GTK_TABLE (mw__table_in), mw__button_video, 2, 3, in_row, in_row+1,
(GtkAttachOptions) (GTK_FILL),
@@ -2127,7 +2127,7 @@
/* the videoextract range from label */
label = gtk_label_new (_("From Frame:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2142,7 +2142,7 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- mw__spinbutton_begin_frame_adj = gtk_adjustment_new (1, 1, 999999, 1, 10, 10);
+ mw__spinbutton_begin_frame_adj = gtk_adjustment_new (1, 1, 999999, 1, 10, 0);
mw__spinbutton_begin_frame = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_begin_frame_adj), 1, 0);
gtk_widget_show (mw__spinbutton_begin_frame);
gtk_widget_set_size_request (mw__spinbutton_begin_frame, SPIN_WIDTH_LARGE, -1);
@@ -2167,7 +2167,7 @@
/* the videorange button (that invokes the player for video range selection) */
mw__button_vrange_dialog = gtk_button_new_with_label (_("Video Range"));
gtk_widget_show (mw__button_vrange_dialog);
- wgt_array[wgt_idx] = mw__button_vrange_dialog;
+ wgt_array[wgt_idx] = mw__button_vrange_dialog;
wgt_idx++;
gtk_table_attach (GTK_TABLE (mw__table_in), mw__button_vrange_dialog, 2, 3, in_row, in_row+1,
(GtkAttachOptions) (GTK_FILL),
@@ -2183,7 +2183,7 @@
/* the videoextract range to label */
label = gtk_label_new (_("To Frame:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2198,7 +2198,7 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- mw__spinbutton_end_frame_adj = gtk_adjustment_new (1, 1, 999999, 1, 10, 10);
+ mw__spinbutton_end_frame_adj = gtk_adjustment_new (1, 1, 999999, 1, 10, 0);
mw__spinbutton_end_frame = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_end_frame_adj), 1, 0);
gtk_widget_show (mw__spinbutton_end_frame);
gtk_box_pack_start (GTK_BOX (hbox2), mw__spinbutton_end_frame, FALSE, FALSE, 0);
@@ -2227,7 +2227,7 @@
/* the videorange button (that invokes the player for video range selection in docked mode) */
mw__button_vrange_docked = gtk_button_new_with_label (_("VideoRange"));
// gtk_widget_show (mw__button_vrange_docked);
-// wgt_array[wgt_idx] = mw__button_vrange_docked;
+// wgt_array[wgt_idx] = mw__button_vrange_docked;
// wgt_idx++;
// gtk_table_attach (GTK_TABLE (mw__table_in), mw__button_vrange_docked, 2, 3, in_row, in_row+1,
// (GtkAttachOptions) (GTK_FILL),
@@ -2240,7 +2240,7 @@
/* the videotrack to label */
label = gtk_label_new (_("Videotrack:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2257,7 +2257,7 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- mw__spinbutton_videotrack_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
+ mw__spinbutton_videotrack_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 0);
mw__spinbutton_videotrack = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_videotrack_adj), 1, 0);
gtk_widget_show (mw__spinbutton_videotrack);
gtk_widget_set_size_request (mw__spinbutton_videotrack, SPIN_WIDTH_SMALL, -1);
@@ -2274,7 +2274,7 @@
/* the audiotrack to label */
label = gtk_label_new (_("Audiotrack:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2291,7 +2291,7 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
- mw__spinbutton_audiotrack_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+ mw__spinbutton_audiotrack_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
mw__spinbutton_audiotrack = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_audiotrack_adj), 1, 0);
gtk_widget_show (mw__spinbutton_audiotrack);
gtk_widget_set_size_request (mw__spinbutton_audiotrack, SPIN_WIDTH_SMALL, -1);
@@ -2310,7 +2310,7 @@
label = gtk_label_new (_("Decoder:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2330,7 +2330,7 @@
/* the menu to select the preferred decoder */
- mw__combo_preferred_decoder
+ mw__combo_preferred_decoder
= gimp_int_combo_box_new (_("(none, automatic)"), GAP_VEX_DECODER_NONE ,
"libmpeg3", GAP_VEX_DECODER_LIBMPEG3,
"libavformat", GAP_VEX_DECODER_LIBAVFORMAT,
@@ -2343,7 +2343,7 @@
gpp);
gtk_widget_show (mw__combo_preferred_decoder);
- wgt_array[wgt_idx] = mw__combo_preferred_decoder;
+ wgt_array[wgt_idx] = mw__combo_preferred_decoder;
wgt_idx++;
gtk_table_attach (GTK_TABLE (mw__table_in), mw__combo_preferred_decoder, 2, 3, in_row, in_row+1,
(GtkAttachOptions) (GTK_FILL),
@@ -2357,7 +2357,7 @@
label = gtk_label_new (_("Active Decoder:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2395,7 +2395,7 @@
label = gtk_label_new (_("Aspect Ratio:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_in), label, 0, 1, in_row, in_row+1,
@@ -2435,7 +2435,7 @@
/* the operating Mode label */
label = gtk_label_new (_("Mode:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), label, 0, 1, out_row, out_row+1,
@@ -2459,7 +2459,7 @@
/* the basename label */
mw__label_basename = gtk_label_new (_("Basename:"));
gtk_widget_show (mw__label_basename);
- lbl_array[lbl_idx] = mw__label_basename;
+ lbl_array[lbl_idx] = mw__label_basename;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (mw__label_basename), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), mw__label_basename, 0, 1, out_row, out_row+1,
@@ -2479,7 +2479,7 @@
/* the basename button (that invokes the fileselection dialog) */
mw__button_basename = gtk_button_new_with_label (_("..."));
gtk_widget_show (mw__button_basename);
- wgt_array[wgt_idx] = mw__button_basename;
+ wgt_array[wgt_idx] = mw__button_basename;
wgt_idx++;
gtk_table_attach (GTK_TABLE (mw__table_out), mw__button_basename, 2, 3, out_row, out_row+1,
(GtkAttachOptions) (GTK_FILL),
@@ -2488,11 +2488,11 @@
out_row++;
-
+
/* the framenumber digits label */
label = gtk_label_new (_("Digits:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), label, 0, 1, out_row, out_row+1,
@@ -2510,7 +2510,7 @@
(GtkAttachOptions) (0), 0, 0);
- mw__spinbutton_fn_digits_adj = gtk_adjustment_new (1, 1, GAP_LIB_MAX_DIGITS, 1, 10, 10);
+ mw__spinbutton_fn_digits_adj = gtk_adjustment_new (1, 1, GAP_LIB_MAX_DIGITS, 1, 10, 0);
mw__spinbutton_fn_digits = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_fn_digits_adj), 1, 0);
gtk_widget_show (mw__spinbutton_fn_digits);
gtk_widget_set_size_request (mw__spinbutton_fn_digits, SPIN_WIDTH_SMALL, -1);
@@ -2573,7 +2573,7 @@
/* the extension label */
mw__label_extension = gtk_label_new (_("Extension:"));
gtk_widget_show (mw__label_extension);
- lbl_array[lbl_idx] = mw__label_extension;
+ lbl_array[lbl_idx] = mw__label_extension;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (mw__label_extension), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), mw__label_extension, 0, 1, out_row, out_row+1,
@@ -2602,11 +2602,11 @@
out_row++;
-
+
/* the framenumber for 1st frame label */
label = gtk_label_new (_("Framenr 1:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), label, 0, 1, out_row, out_row+1,
@@ -2620,7 +2620,7 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- mw__spinbutton_basenum_adj = gtk_adjustment_new (0, 0, 10000, 1, 10, 10);
+ mw__spinbutton_basenum_adj = gtk_adjustment_new (0, 0, 10000, 1, 10, 0);
mw__spinbutton_basenum = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_basenum_adj), 1, 0);
gtk_widget_show (mw__spinbutton_basenum);
gtk_widget_set_size_request (mw__spinbutton_basenum, SPIN_WIDTH_LARGE, -1);
@@ -2637,7 +2637,7 @@
/* the deinterlace Mode label */
label = gtk_label_new (_("Deinterlace:"));
gtk_widget_show (label);
- lbl_array[lbl_idx] = label;
+ lbl_array[lbl_idx] = label;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), label, 0, 1, out_row, out_row+1,
@@ -2651,7 +2651,7 @@
(GtkAttachOptions) (0), 0, 0);
/* the deinterlace threshold spinbutton */
- mw__spinbutton_delace_threshold_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0.1);
+ mw__spinbutton_delace_threshold_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0.0);
mw__spinbutton_delace_threshold = gtk_spin_button_new (GTK_ADJUSTMENT (mw__spinbutton_delace_threshold_adj), 1, 2);
gtk_widget_show (mw__spinbutton_delace_threshold);
gtk_box_pack_start (GTK_BOX (hbox2), mw__spinbutton_delace_threshold, FALSE, FALSE, 0);
@@ -2660,7 +2660,7 @@
/* the deinterlace combo */
- mw__combo_deinterlace
+ mw__combo_deinterlace
= gimp_int_combo_box_new (_("no deinterlace"), GAP_VEX_DELACE_NONE,
_("deinterlace (odd lines only)"), GAP_VEX_DELACE_ODD,
_("deinterlace (even lines only)"), GAP_VEX_DELACE_EVEN,
@@ -2683,7 +2683,7 @@
/* the output audiofile label */
mw__label_audifile = gtk_label_new (_("Audiofile:"));
gtk_widget_show (mw__label_audifile);
- lbl_array[lbl_idx] = mw__label_audifile;
+ lbl_array[lbl_idx] = mw__label_audifile;
lbl_idx++;
gtk_misc_set_alignment (GTK_MISC (mw__label_audifile), 0.0, 0);
gtk_table_attach (GTK_TABLE (mw__table_out), mw__label_audifile, 0, 1, out_row, out_row+1,
@@ -2703,7 +2703,7 @@
/* the output audiofile button (that invokes the fileselection dialog) */
mw__button_audiofile = gtk_button_new_with_label (_("..."));
gtk_widget_show (mw__button_audiofile);
- wgt_array[wgt_idx] = mw__button_audiofile;
+ wgt_array[wgt_idx] = mw__button_audiofile;
wgt_idx++;
gtk_table_attach (GTK_TABLE (mw__table_out), mw__button_audiofile, 2, 3, out_row, out_row+1,
(GtkAttachOptions) (GTK_FILL),
@@ -2824,9 +2824,9 @@
gpp->mw__button_OK = mw__button_OK;
gpp->mw__player_frame = mw__player_frame;
p_init_mw__main_window_widgets(gpp);
-
+
/* endif GAP_ENABLE_VIDEOAPI_SUPPORT (2) */
-#endif
+#endif
return mw__main_window;
} /* end gap_vex_dlg_create_mw__main_window */
@@ -2842,7 +2842,7 @@
{
gimp_ui_init ("gap_video_extract", FALSE);
gap_stock_init();
-
+
gpp->fsv__fileselection = NULL;
gpp->fsb__fileselection = NULL;
gpp->fsa__fileselection = NULL;
Modified: trunk/gap/gap_wr_color_curve.c
==============================================================================
--- trunk/gap/gap_wr_color_curve.c (original)
+++ trunk/gap/gap_wr_color_curve.c Tue Jan 20 16:47:26 2009
@@ -989,23 +989,65 @@
* p_run_curves_tool
* ----------------------------------------
* run the curves feature of the gimp color curves tool
- * for all channels
+ * for all relevant histogram channels
*/
static void
p_run_curves_tool(gint32 drawable_id, wr_curves_val_t *cuvals)
{
gint32 l_idx;
gint32 l_channel;
+ gint32 l_channel_histogram;
gint8 curve_points[256];
- for(l_channel=0; l_channel < 5; l_channel++)
+ for(l_channel=4; l_channel >= 0; l_channel--)
{
+ gboolean isChannelRelevant;
+
for(l_idx=0; l_idx < 256; l_idx++)
{
/* curve_points[l_idx] = (gint8)ROUND(cuvals->val_curve[l_channel][l_idx]); */
curve_points[l_idx] = (gint8)cuvals->val_curve[l_channel][l_idx];
}
- p_gimp_curves_explicit(drawable_id, l_channel, 256, curve_points);
+
+ l_channel_histogram = l_channel;
+ isChannelRelevant = FALSE;
+
+ switch (l_channel)
+ {
+ case 0: /* HISTOGRAM-VALUE */
+ if (gimp_drawable_is_gray(drawable_id))
+ {
+ isChannelRelevant = TRUE;
+ }
+ else if (gimp_drawable_is_rgb(drawable_id))
+ {
+ isChannelRelevant = TRUE;
+ }
+ break;
+ case 1: /* HISTOGRAM-RED */
+ case 2: /* HISTOGRAM-GREEN */
+ case 3: /* HISTOGRAM-BLUE */
+ if (gimp_drawable_is_rgb(drawable_id))
+ {
+ isChannelRelevant = TRUE;
+ }
+ break;
+ case 4: /* HISTOGRAM-ALPHA */
+ if (gimp_drawable_has_alpha(drawable_id))
+ {
+ isChannelRelevant = TRUE;
+ }
+ break;
+ default:
+ isChannelRelevant = FALSE;
+ break;
+
+ }
+
+ if (isChannelRelevant)
+ {
+ p_gimp_curves_explicit(drawable_id, l_channel_histogram, 256, curve_points);
+ }
}
}
Modified: trunk/gap/gap_wr_color_huesat.c
==============================================================================
--- trunk/gap/gap_wr_color_huesat.c (original)
+++ trunk/gap/gap_wr_color_huesat.c Tue Jan 20 16:47:26 2009
@@ -296,7 +296,7 @@
-static void
+static void
run(const gchar *name
, gint nparams
, const GimpParam *param
@@ -705,21 +705,21 @@
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
- spinbutton_sat_adj = gtk_adjustment_new (0, -100, 100, 1, 10, 10);
+ spinbutton_sat_adj = gtk_adjustment_new (0, -100, 100, 1, 10, 0);
spinbutton_sat = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_sat_adj), 1, 0);
gtk_widget_show (spinbutton_sat);
gtk_table_attach (GTK_TABLE (table1), spinbutton_sat, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- spinbutton_light_adj = gtk_adjustment_new (0, -100, 100, 1, 10, 10);
+ spinbutton_light_adj = gtk_adjustment_new (0, -100, 100, 1, 10, 0);
spinbutton_light = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_light_adj), 1, 0);
gtk_widget_show (spinbutton_light);
gtk_table_attach (GTK_TABLE (table1), spinbutton_light, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- spinbutton_hue_adj = gtk_adjustment_new (0, -180, 180, 1, 10, 10);
+ spinbutton_hue_adj = gtk_adjustment_new (0, -180, 180, 1, 10, 0);
spinbutton_hue = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_hue_adj), 1, 0);
gtk_widget_show (spinbutton_hue);
gtk_table_attach (GTK_TABLE (table1), spinbutton_hue, 1, 2, 1, 2,
Modified: trunk/gap/gap_wr_color_levels.c
==============================================================================
--- trunk/gap/gap_wr_color_levels.c (original)
+++ trunk/gap/gap_wr_color_levels.c Tue Jan 20 16:47:26 2009
@@ -303,7 +303,7 @@
}
-static void
+static void
run(const gchar *name
, gint nparams
, const GimpParam *param
@@ -596,7 +596,7 @@
/* The dialog1 and main vbox */
dialog1 = gimp_dialog_new (_("Color Levels"), "levels_wrapper",
NULL, 0,
- gimp_standard_help_func, PLUG_IN_HELP_ID,
+ gimp_standard_help_func, PLUG_IN_HELP_ID,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -713,21 +713,21 @@
/* SPINBUTTONS */
- spinbutton_low_input_adj = gtk_adjustment_new (0, 0, 255, 1, 10, 10);
+ spinbutton_low_input_adj = gtk_adjustment_new (0, 0, 255, 1, 10, 0);
spinbutton_low_input = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_low_input_adj), 1, 0);
gtk_widget_show (spinbutton_low_input);
gtk_table_attach (GTK_TABLE (table1), spinbutton_low_input, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- spinbutton_high_input_adj = gtk_adjustment_new (255, 0, 255, 1, 10, 10);
+ spinbutton_high_input_adj = gtk_adjustment_new (255, 0, 255, 1, 10, 0);
spinbutton_high_input = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_high_input_adj), 1, 0);
gtk_widget_show (spinbutton_high_input);
gtk_table_attach (GTK_TABLE (table1), spinbutton_high_input, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- spinbutton_gamma_adj = gtk_adjustment_new (1, 0.1, 10, 0.1, 1, 10);
+ spinbutton_gamma_adj = gtk_adjustment_new (1, 0.1, 10, 0.1, 1, 0);
spinbutton_gamma = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_gamma_adj), 0.1, 2);
gtk_widget_show (spinbutton_gamma);
gtk_table_attach (GTK_TABLE (table1), spinbutton_gamma, 1, 2, 3, 4,
@@ -735,14 +735,14 @@
(GtkAttachOptions) (0), 0, 0);
- spinbutton_low_output_adj = gtk_adjustment_new (0, 0, 255, 1, 10, 10);
+ spinbutton_low_output_adj = gtk_adjustment_new (0, 0, 255, 1, 10, 0);
spinbutton_low_output = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_low_output_adj), 1, 0);
gtk_widget_show (spinbutton_low_output);
gtk_table_attach (GTK_TABLE (table1), spinbutton_low_output, 1, 2, 4, 5,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- spinbutton_high_output_adj = gtk_adjustment_new (255, 0, 255, 1, 10, 10);
+ spinbutton_high_output_adj = gtk_adjustment_new (255, 0, 255, 1, 10, 0);
spinbutton_high_output = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_high_output_adj), 1, 0);
gtk_widget_show (spinbutton_high_output);
gtk_table_attach (GTK_TABLE (table1), spinbutton_high_output, 1, 2, 5, 6,
Modified: trunk/vid_common/gap_cme_gui.c
==============================================================================
--- trunk/vid_common/gap_cme_gui.c (original)
+++ trunk/vid_common/gap_cme_gui.c Tue Jan 20 16:47:26 2009
@@ -430,9 +430,9 @@
for (j = 0; j < num_procs; j++)
{
gboolean l_has_proc_info;
-
+
i = (num_procs -1) - j;
-
+
l_has_proc_info = gimp_procedural_db_proc_info (proc_list[i],
&l_proc_blurb,
&l_proc_help,
@@ -444,7 +444,7 @@
&l_nreturn_vals,
&l_paramdef,
&l_return_vals);
-
+
if(gap_debug)
{
printf("pdb_find_video_encoders: check proc:%s has_proc_info:%d\n"
@@ -763,7 +763,7 @@
{
gint32 l_frame_cnt;
-
+
/* Range limits for widgets "cme__spinbutton_from" and "cme__spinbutton_to"
* If there is just one frame, we operate on layers
*/
@@ -2583,7 +2583,7 @@
gpp);
/* the (output) video filebrowser button */
-
+
button = gtk_button_new_with_label (_("..."));
gpp->cme__button_video_filesel = button;
gtk_widget_show (button);
@@ -3239,7 +3239,7 @@
/* the Samplerate spinbutton */
- adj = gtk_adjustment_new (44100, 1000, 100000, 10, 100, 1000);
+ adj = gtk_adjustment_new (44100, 1000, 100000, 10, 100, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->cme__spinbutton_samplerate_adj = adj;
gpp->cme__spinbutton_samplerate = spinbutton;
@@ -3465,7 +3465,7 @@
/* the from_frame spinbutton */
- adj = gtk_adjustment_new (1, 0, 100000, 1, 10, 10);
+ adj = gtk_adjustment_new (1, 0, 100000, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->cme__spinbutton_from_adj = adj;
gpp->cme__spinbutton_from = spinbutton;
@@ -3498,7 +3498,7 @@
(GtkAttachOptions) (0), 0, 0);
/* the to_frame spinbutton */
- adj = gtk_adjustment_new (1, 0, 100000, 1, 10, 10);
+ adj = gtk_adjustment_new (1, 0, 100000, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->cme__spinbutton_to_adj = adj;
gpp->cme__spinbutton_to = spinbutton;
@@ -3524,7 +3524,7 @@
/* the width spinbutton */
- adj = gtk_adjustment_new (10, 10, 10000, 1, 10, 10);
+ adj = gtk_adjustment_new (10, 10, 10000, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->cme__spinbutton_width_adj = adj;
gpp->cme__spinbutton_width = spinbutton;
@@ -3572,7 +3572,7 @@
(GtkAttachOptions) (0), 0, 0);
/* the height spinbutton */
- adj = gtk_adjustment_new (10, 10, 10000, 1, 10, 10);
+ adj = gtk_adjustment_new (10, 10, 10000, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->cme__spinbutton_height_adj = adj;
gpp->cme__spinbutton_height = spinbutton;
@@ -3599,7 +3599,7 @@
/* the framerate spinbutton */
- adj = gtk_adjustment_new (24, 1, 100, 0.1, 1, 10);
+ adj = gtk_adjustment_new (24, 1, 100, 0.1, 1, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->cme__spinbutton_framerate_adj = adj;
gpp->cme__spinbutton_framerate = spinbutton;
@@ -3879,7 +3879,7 @@
* (without this workaround my gtk version 2.10.14 shows just
* the highest digit of the number, probably because the size at creation time
* was only one character)
- *
+ *
*/
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_label_set_text(GTK_LABEL(label), buffer);
@@ -3891,7 +3891,7 @@
/* ----------------------------------------
* gap_cme_gui_update_encoder_status
* ----------------------------------------
- *
+ *
*/
void
gap_cme_gui_update_encoder_status(GapCmeGlobalParams *gpp)
@@ -3909,7 +3909,7 @@
gap_gve_misc_get_master_encoder_progress(&gpp->encStatus);
gtk_widget_show(gpp->cme__encoder_status_frame);
-
+
p_set_label_to_numeric_value(gpp->cme__label_enc_stat_frames_total, gpp->encStatus.total_frames);
p_set_label_to_numeric_value(gpp->cme__label_enc_stat_frames_done, gpp->encStatus.frames_processed);
p_set_label_to_numeric_value(gpp->cme__label_enc_stat_frames_encoded, gpp->encStatus.frames_encoded);
@@ -3920,11 +3920,11 @@
{
gdouble l_progress;
char *l_msg;
-
+
l_progress = CLAMP((gdouble)gpp->encStatus.frames_processed / (gdouble)(MAX(1.0, gpp->encStatus.total_frames))
, 0.0, 1.0
);
-
+
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR (pbar), l_progress);
l_msg = g_strdup_printf(_("Video encoding %d of %d frames done")
, gpp->encStatus.frames_processed
@@ -4007,7 +4007,7 @@
{
g_free(l_tmpname);
}
-
+
return (l_rc);
} /* end gap_cme_gui_start_video_encoder */
@@ -4029,7 +4029,7 @@
}
gap_cme_gui_start_video_encoder(gpp);
-
+
if(gap_debug)
{
printf("THREAD gap_cme_encoder_worker_thread TERMINATING: %d\n", (int)gpp->val.gui_proc_thread);
Modified: trunk/vid_enc_avi/gap_enc_avi_gui.c
==============================================================================
--- trunk/vid_enc_avi/gap_enc_avi_gui.c (original)
+++ trunk/vid_enc_avi/gap_enc_avi_gui.c Tue Jan 20 16:47:26 2009
@@ -689,7 +689,7 @@
/* the jpeg quality spinbutton */
adj = gtk_adjustment_new (epp->jpeg_quality
, 0, 100
- , 1, 10, 10);
+ , 1, 10, 0);
gpp->jpg_quality_spinbutton_adj = adj;
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->jpg_quality_spinbutton = spinbutton;
@@ -709,7 +709,7 @@
/* the notebook page for PNG Codec options */
/* ----------------------------------------- */
notebook_page_idx++;
-
+
frame_png = gimp_frame_new (_("PNG Codec Options"));
gtk_widget_show (frame_png);
gtk_container_add (GTK_CONTAINER (notebook_main), frame_png);
@@ -799,7 +799,7 @@
/* the jpeg quality spinbutton */
adj = gtk_adjustment_new (epp->png_compression
, 0, 9
- , 1, 10, 10);
+ , 1, 10, 0);
gpp->png_compression_spinbutton_adj = adj;
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->png_compression_spinbutton = spinbutton;
@@ -822,7 +822,7 @@
/* the notebook page for RAW Codec options */
/* ----------------------------------------- */
notebook_page_idx++;
-
+
frame_raw = gimp_frame_new (_("RAW Codec Options"));
gtk_widget_show (frame_raw);
gtk_container_add (GTK_CONTAINER (notebook_main), frame_raw);
@@ -921,7 +921,7 @@
/* the xvid KBitrate spinbutton */
adj = gtk_adjustment_new (epp->xvid.rc_bitrate / 1000
, -1, 9999
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_rc_kbitrate_spinbutton_adj = adj;
gpp->xvid_rc_kbitrate_spinbutton = spinbutton;
@@ -952,7 +952,7 @@
/* the xvid Reaction Delay spinbutton */
adj = gtk_adjustment_new (epp->xvid.rc_reaction_delay_factor
, -1, 100
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_rc_reaction_delay_spinbutton_adj = adj;
gpp->xvid_rc_reaction_delay_spinbutton = spinbutton;
@@ -983,7 +983,7 @@
/* the xvid AVG Period spinbutton */
adj = gtk_adjustment_new (epp->xvid.rc_averaging_period
, -1, 1000
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_rc_avg_period_spinbutton_adj = adj;
gpp->xvid_rc_avg_period_spinbutton = spinbutton;
@@ -1014,7 +1014,7 @@
/* the xvid Buffer spinbutton */
adj = gtk_adjustment_new (epp->xvid.rc_buffer
, -1, 100
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_rc_buffer_spinbutton_adj = adj;
gpp->xvid_rc_buffer_spinbutton = spinbutton;
@@ -1045,7 +1045,7 @@
/* the xvid max_quantizer spinbutton */
adj = gtk_adjustment_new (epp->xvid.max_quantizer
, 1, 31
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_max_quantizer_spinbutton_adj = adj;
gpp->xvid_max_quantizer_spinbutton = spinbutton;
@@ -1075,7 +1075,7 @@
/* the xvid min_quantizer spinbutton */
adj = gtk_adjustment_new (epp->xvid.min_quantizer
, 1, 31
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_min_quantizer_spinbutton_adj = adj;
gpp->xvid_min_quantizer_spinbutton = spinbutton;
@@ -1106,7 +1106,7 @@
/* the xvid max_key_interval spinbutton */
adj = gtk_adjustment_new (epp->xvid.max_key_interval
, 1, 500
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_max_key_interval_spinbutton_adj = adj;
gpp->xvid_max_key_interval_spinbutton = spinbutton;
@@ -1136,7 +1136,7 @@
/* the xvid quality spinbutton */
adj = gtk_adjustment_new (epp->xvid.quality_preset
, 0, 6
- , 1, 10, 10);
+ , 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->xvid_quality_spinbutton_adj = adj;
gpp->xvid_quality_spinbutton = spinbutton;
Modified: trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
==============================================================================
--- trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c (original)
+++ trunk/vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c Tue Jan 20 16:47:26 2009
@@ -1209,7 +1209,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the audio bitrate spinbutton */
- adj = gtk_adjustment_new (160, 0, 500, 10, 100, 100);
+ adj = gtk_adjustment_new (160, 0, 500, 10, 100, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_aud_bitrate_spinbutton_adj = adj;
gpp->ff_aud_bitrate_spinbutton = spinbutton;
@@ -1271,7 +1271,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the video bitrate spinbutton */
- adj = gtk_adjustment_new (1000, 0, 10000, 100, 1000, 1000);
+ adj = gtk_adjustment_new (1000, 0, 10000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_vid_bitrate_spinbutton_adj = adj;
gpp->ff_vid_bitrate_spinbutton = spinbutton;
@@ -1302,10 +1302,10 @@
/* the qscale spinbutton */
#ifdef HAVE_OLD_FFMPEG_0408
- adj = gtk_adjustment_new (0, 0, 31, 1, 10, 10);
+ adj = gtk_adjustment_new (0, 0, 31, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
#else
- adj = gtk_adjustment_new (0, 0, 255, 1, 10, 10);
+ adj = gtk_adjustment_new (0, 0, 255, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
#endif
gpp->ff_qscale_spinbutton_adj = adj;
@@ -1336,7 +1336,7 @@
/* the qmin spinbutton */
- adj = gtk_adjustment_new (1, 0, 31, 1, 10, 10);
+ adj = gtk_adjustment_new (1, 0, 31, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_qmin_spinbutton_adj = adj;
gpp->ff_qmin_spinbutton = spinbutton;
@@ -1364,7 +1364,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the qmax spinbutton */
- adj = gtk_adjustment_new (1, 0, 31, 1, 10, 10);
+ adj = gtk_adjustment_new (1, 0, 31, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_qmax_spinbutton_adj = adj;
gpp->ff_qmax_spinbutton = spinbutton;
@@ -1393,7 +1393,7 @@
/* the qdiff spinbutton */
- adj = gtk_adjustment_new (3, 0, 100, 1, 10, 10);
+ adj = gtk_adjustment_new (3, 0, 100, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_qdiff_spinbutton_adj = adj;
gpp->ff_qdiff_spinbutton = spinbutton;
@@ -1446,7 +1446,7 @@
/* the GOP spinbutton */
- adj = gtk_adjustment_new (12, 0, 512, 1, 10, 10);
+ adj = gtk_adjustment_new (12, 0, 512, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_gop_size_spinbutton_adj = adj;
gpp->ff_gop_size_spinbutton = spinbutton;
@@ -1473,7 +1473,7 @@
/* the B_frames spinbutton */
- adj = gtk_adjustment_new (0, 0, (gdouble)FF_MAX_B_FRAMES, 1, 1, 1);
+ adj = gtk_adjustment_new (0, 0, (gdouble)FF_MAX_B_FRAMES, 1, 1, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_b_frames_spinbutton_adj = adj;
gpp->ff_b_frames_spinbutton = spinbutton;
@@ -2545,7 +2545,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the qblur spinbutton */
- adj = gtk_adjustment_new (0.5, 0, 100, 0.25, 10, 10);
+ adj = gtk_adjustment_new (0.5, 0, 100, 0.25, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_qblur_spinbutton_adj = adj;
gpp->ff_qblur_spinbutton = spinbutton;
@@ -2574,7 +2574,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the qcomp spinbutton */
- adj = gtk_adjustment_new (0.5, 0, 100, 0.25, 10, 10);
+ adj = gtk_adjustment_new (0.5, 0, 100, 0.25, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_qcomp_spinbutton_adj = adj;
gpp->ff_qcomp_spinbutton = spinbutton;
@@ -2600,7 +2600,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the rc-init-cplx spinbutton */
- adj = gtk_adjustment_new (1.25, 0, 100, 0.25, 10, 10);
+ adj = gtk_adjustment_new (1.25, 0, 100, 0.25, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_rc_init_cplx_spinbutton_adj = adj;
gpp->ff_rc_init_cplx_spinbutton = spinbutton;
@@ -2627,7 +2627,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the b-qfactor spinbutton */
- adj = gtk_adjustment_new (1.25, -100, 100, 0.2, 10, 10);
+ adj = gtk_adjustment_new (1.25, -100, 100, 0.2, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_b_qfactor_spinbutton_adj = adj;
gpp->ff_b_qfactor_spinbutton = spinbutton;
@@ -2653,7 +2653,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the i-qfactor spinbutton */
- adj = gtk_adjustment_new (-0.8, -100, 100, 0.2, 10, 10);
+ adj = gtk_adjustment_new (-0.8, -100, 100, 0.2, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_i_qfactor_spinbutton_adj = adj;
gpp->ff_i_qfactor_spinbutton = spinbutton;
@@ -2681,7 +2681,7 @@
/* the b-qoffset spinbutton */
- adj = gtk_adjustment_new (1.25, 0, 100, 0.25, 10, 10);
+ adj = gtk_adjustment_new (1.25, 0, 100, 0.25, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_b_qoffset_spinbutton_adj = adj;
gpp->ff_b_qoffset_spinbutton = spinbutton;
@@ -2707,7 +2707,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the i-qoffset spinbutton */
- adj = gtk_adjustment_new (0, 0, 100, 0.25, 10, 10);
+ adj = gtk_adjustment_new (0, 0, 100, 0.25, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 2);
gpp->ff_i_qoffset_spinbutton_adj = adj;
gpp->ff_i_qoffset_spinbutton = spinbutton;
@@ -2734,7 +2734,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the Bitrate Tolerance spinbutton */
- adj = gtk_adjustment_new (4200, 0, 10000, 100, 1000, 10);
+ adj = gtk_adjustment_new (4200, 0, 10000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_bitrate_tol_spinbutton_adj = adj;
gpp->ff_bitrate_tol_spinbutton = spinbutton;
@@ -2761,7 +2761,7 @@
/* the Maxrate Tolerance spinbutton */
- adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 10);
+ adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_maxrate_tol_spinbutton_adj = adj;
gpp->ff_maxrate_tol_spinbutton = spinbutton;
@@ -2789,7 +2789,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the Minrate Tolerance spinbutton */
- adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 10);
+ adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_minrate_tol_spinbutton_adj = adj;
gpp->ff_minrate_tol_spinbutton = spinbutton;
@@ -2816,7 +2816,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the Bufsize spinbutton */
- adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 10);
+ adj = gtk_adjustment_new (0, 0, 10000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_bufsize_spinbutton_adj = adj;
gpp->ff_bufsize_spinbutton = spinbutton;
@@ -2843,7 +2843,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the strictness spinbutton */
- adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
+ adj = gtk_adjustment_new (1, 0, 100, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_strict_spinbutton_adj = adj;
gpp->ff_strict_spinbutton = spinbutton;
@@ -2871,7 +2871,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the mb-qmin spinbutton */
- adj = gtk_adjustment_new (0, 0, 31, 1, 10, 10);
+ adj = gtk_adjustment_new (0, 0, 31, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_mb_qmin_spinbutton_adj = adj;
gpp->ff_mb_qmin_spinbutton = spinbutton;
@@ -2898,7 +2898,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the mb-qmax spinbutton */
- adj = gtk_adjustment_new (31, 0, 31, 1, 10, 10);
+ adj = gtk_adjustment_new (31, 0, 31, 1, 10, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_mb_qmax_spinbutton_adj = adj;
gpp->ff_mb_qmax_spinbutton = spinbutton;
@@ -3020,7 +3020,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the video bitrate spinbutton */
- adj = gtk_adjustment_new (0, 0, 1000000, 100, 1000, 1000);
+ adj = gtk_adjustment_new (0, 0, 1000000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_mux_rate_adj = adj;
gpp->ff_mux_rate_spinbutton = spinbutton;
@@ -3052,7 +3052,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the video bitrate spinbutton */
- adj = gtk_adjustment_new (0, 0, 32000, 100, 1000, 1000);
+ adj = gtk_adjustment_new (0, 0, 32000, 100, 1000, 0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gpp->ff_mux_packet_size_adj = adj;
gpp->ff_mux_packet_size_spinbutton = spinbutton;
@@ -3086,7 +3086,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the video bitrate spinbutton */
- adj = gtk_adjustment_new (0.0, 0.0, 100.0, 0.01, 0.1, 0.1);
+ adj = gtk_adjustment_new (0.0, 0.0, 100.0, 0.01, 0.1, 0.0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 3);
gpp->ff_mux_preload_adj = adj;
gpp->ff_mux_preload_spinbutton = spinbutton;
@@ -3119,7 +3119,7 @@
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
/* the video bitrate spinbutton */
- adj = gtk_adjustment_new (0.0, 0.0, 100.0, 0.01, 0.1, 0.1);
+ adj = gtk_adjustment_new (0.0, 0.0, 100.0, 0.01, 0.1, 0.0);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 3);
gpp->ff_mux_max_delay_adj = adj;
gpp->ff_mux_max_delay_spinbutton = spinbutton;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
