From 4816172d1af45ea1a98b51f9c1309497701f65dd Mon Sep 17 00:00:00 2001 From: Niels Elburg Date: Wed, 25 Jan 2006 22:03:54 +0000 Subject: [PATCH] cleanup, version bump, gveejay theme fixes, fix vims 130, proper naming of things in gui, default title of sample, sample's title as recording name, fixed a few compile warnings git-svn-id: svn://code.dyne.org/veejay/trunk@515 eb8d1916-c9e9-0310-b8de-cf0c9472ead5 --- veejay-current/configure.ac | 4 +- veejay-current/gveejay-reloaded/callback.c | 35 ++- veejay-current/gveejay-reloaded/common.h | 2 +- veejay-current/gveejay-reloaded/curve.c | 5 - veejay-current/gveejay-reloaded/multitrack.c | 1 - veejay-current/gveejay-reloaded/sequence.c | 3 + veejay-current/gveejay-reloaded/vj-api.c | 31 +-- veejay-current/libsample/sampleadm.c | 6 +- veejay-current/libsamplerec/samplerecord.c | 5 +- veejay-current/libvje/effects/videowall.c | 3 +- veejay-current/libvjnet/vj-server.c | 2 +- veejay-current/share/gveejay.rc | 108 ++------- veejay-current/share/gveejay.reloaded.glade | 231 ++++++------------- veejay-current/veejay/veejay.c | 2 +- 14 files changed, 142 insertions(+), 296 deletions(-) diff --git a/veejay-current/configure.ac b/veejay-current/configure.ac index 24da7482..f51a6101 100644 --- a/veejay-current/configure.ac +++ b/veejay-current/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl AC_INIT -AC_INIT([veejay],[0.9.2],[veejay-users@lissts.sourceforge.net]) +AC_INIT([veejay],[0.9.3],[veejay-users@lissts.sourceforge.net]) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([veejay/veejay.c]) VEEJAY_MAJOR_VERSION=0 VEEJAY_MINOR_VERSION=9 -VEEJAY_MICRO_VERSION=2 +VEEJAY_MICRO_VERSION=3 VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION VEEJAY_CODENAME="Resume - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" AC_CONFIG_HEADERS([config.h]) diff --git a/veejay-current/gveejay-reloaded/callback.c b/veejay-current/gveejay-reloaded/callback.c index 5f2a1b2b..a1b65918 100644 --- a/veejay-current/gveejay-reloaded/callback.c +++ b/veejay-current/gveejay-reloaded/callback.c @@ -866,13 +866,36 @@ void on_button_sample_recordstart_clicked(GtkWidget *widget, gpointer user_data) gint nframes = info->uc.sample_rec_duration; if(nframes <= 0) return; - + /* + int br=0; int bw=0; + gchar *utftext = (gchar*) get_text( "entry_samplename"); + + if(!utftext) + return; + + gchar *text = g_locale_from_utf8( utftext, -1, &br, &bw,NULL); + if(!text || strlen(text) <= 1) + return; + + int i = 0; + while( text[i] != '\0' ) + { + if( !isalnum( text[i] )) + { + vj_msg(VEEJAY_MSG_ERROR, "Only alphanumeric characters allowed"); + if( text) free(text); + return; + } + } + + multi_vims( VIMS_SAMPLE_SET_DESCRIPTION, "%d %s", 0, text ); + g_free(text); + */ if(format != NULL) { multi_vims( VIMS_RECORD_DATAFORMAT,"%s", format ); } - multi_vims( VIMS_SAMPLE_REC_START, "%d %d", nframes, @@ -1576,7 +1599,6 @@ void on_curve_buttonstore_clicked(GtkWidget *widget, gpointer user_data ) if( (end - start) <= 0 || id <= 0 ) { - printf("end = %d, start = %d , id = %d\n",end,start,id); return; } @@ -1613,7 +1635,6 @@ void on_curve_buttontime_clicked(GtkWidget *widget, gpointer user_data ) if( (end - start) <= 0 || id <= 0 ) { - printf("end = %d, start = %d , id = %d\n",end,start,id); return; } GtkWidget *curve = glade_xml_get_widget_( info->main_window, "curve"); @@ -1929,7 +1950,6 @@ void on_button_sdlclose_clicked(GtkWidget *w, gpointer user_data) void on_quicklaunch_clicked(GtkWidget *widget, gpointer user_data) { -printf("State = %d\n", info->watch.state); if( info->watch.state == STATE_STOPPED ) { vj_fork_or_connect_veejay( config_file ); @@ -2256,7 +2276,6 @@ gboolean on_entry_filename_focus_in_event( GtkWidget *w, gpointer user_data) void on_previewtoggle_toggled(GtkWidget *w, gpointer user_data) { - printf("%s:%d\n", __FUNCTION__, __LINE__ ); if(!info->status_lock) { multitrack_preview_master( info->mt, is_button_toggled("previewtoggle")); @@ -2311,27 +2330,23 @@ void on_previewsmall_clicked( GtkWidget *w, gpointer user_data) void on_multitrack_activate( GtkWidget *w, gpointer user_data) { - printf("%s\n", __FUNCTION__ ); multitrack_open( info->mt ); gtk_widget_show( glade_xml_get_widget_( info->main_window , "mtwindow" )); } void on_multitrack_deactivate( GtkWidget *w, gpointer user_data) { - printf("%s\n", __FUNCTION__ ); multitrack_close( info->mt ); gtk_widget_hide( glade_xml_get_widget_( info->main_window , "mtwindow" )); } void on_mt_new_activate( GtkWidget *w, gpointer user_data) { - printf("%s\n",__FUNCTION__ ); multitrack_add_track( info->mt ); } void on_mt_delete_activate( GtkWidget *w, gpointer user_data) { - printf("%s\n", __FUNCTION__ ); multitrack_close_track( info->mt ); } diff --git a/veejay-current/gveejay-reloaded/common.h b/veejay-current/gveejay-reloaded/common.h index bc6479f6..3ff3ce51 100644 --- a/veejay-current/gveejay-reloaded/common.h +++ b/veejay-current/gveejay-reloaded/common.h @@ -20,7 +20,7 @@ #define GVRCOMMON_H #define STATUS_BYTES 100 #define STATUS_TOKENS 19 -#define VEEJAY_CODENAME "Resume build 2k6 v. beta 1" +#define VEEJAY_CODENAME "Resume build 2k6 v. beta 2" /* Status bytes */ #define ELAPSED_TIME 0 diff --git a/veejay-current/gveejay-reloaded/curve.c b/veejay-current/gveejay-reloaded/curve.c index ce4ce1c1..1add6a1f 100644 --- a/veejay-current/gveejay-reloaded/curve.c +++ b/veejay-current/gveejay-reloaded/curve.c @@ -38,8 +38,6 @@ key_chain_t *new_chain(void) void del_chain( key_chain_t *chain ) { - printf("%s :%d %p\n",__FUNCTION__ ,__LINE__ , chain); - if(chain) { gint i; @@ -139,7 +137,6 @@ void debug_key( key_parameter_t *key ) void clear_parameter_values( key_parameter_t *key ) { - printf("%s :%d\n",__FUNCTION__ ,__LINE__); if(key) { if(key->vector) @@ -178,8 +175,6 @@ int get_parameter_key_value( key_parameter_t *key, gint frame_pos, float *result void get_points_from_curve( key_parameter_t *key, GtkWidget *curve ) { - printf("%s :%d\n",__FUNCTION__ ,__LINE__); - gtk_curve_get_vector( GTK_CURVE(curve), key->curve_len, key->vector ); } diff --git a/veejay-current/gveejay-reloaded/multitrack.c b/veejay-current/gveejay-reloaded/multitrack.c index 71b6d614..9c41df8e 100644 --- a/veejay-current/gveejay-reloaded/multitrack.c +++ b/veejay-current/gveejay-reloaded/multitrack.c @@ -1079,7 +1079,6 @@ void multitrack_set_current( void *data, char *hostname, int port_num , int wid void multitrack_restart(void *data) { - //printf("\t%s\n",__FUNCTION__); } static gboolean seqv_mouse_press_event ( GtkWidget *w, GdkEventButton *event, gpointer user_data) diff --git a/veejay-current/gveejay-reloaded/sequence.c b/veejay-current/gveejay-reloaded/sequence.c index 72e2c115..b387dfc4 100644 --- a/veejay-current/gveejay-reloaded/sequence.c +++ b/veejay-current/gveejay-reloaded/sequence.c @@ -364,6 +364,9 @@ void *veejay_sequence_thread(gpointer data) void veejay_abort_sequence( void *data ) { veejay_sequence_t *v = (veejay_sequence_t*) data; + if(!v) + return; + g_mutex_lock(v->mutex); v->abort = 1; g_mutex_unlock(v->mutex); diff --git a/veejay-current/gveejay-reloaded/vj-api.c b/veejay-current/gveejay-reloaded/vj-api.c index dcc92908..07b65324 100644 --- a/veejay-current/gveejay-reloaded/vj-api.c +++ b/veejay-current/gveejay-reloaded/vj-api.c @@ -5502,15 +5502,10 @@ static gboolean veejay_tick( GIOChannel *source, GIOCondition condition, gpointe { vj_gui_t *gui = (vj_gui_t*) data; if( (condition&G_IO_ERR) ) { -printf("%s Ends %d\n",__FUNCTION__, __LINE__); return FALSE; } if( (condition&G_IO_HUP) ) { -printf("%s Ends %d\n",__FUNCTION__, __LINE__); - return FALSE; } if( (condition&G_IO_NVAL) ) { -printf("%s Ends %d\n",__FUNCTION__, __LINE__); - return FALSE; } if(gui->watch.state==STATE_PLAYING && (condition & G_IO_IN)&& gui->watch.p_state == 0 ) @@ -5524,8 +5519,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__); if(sta_len[0] != 'V' || nb <= 0 ) { -printf("%s Ends %d\n",__FUNCTION__, __LINE__); - gui->status_lock = 0; G_UNLOCK( status_lock__ ); return FALSE; @@ -5534,8 +5527,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__); sscanf( sta_len+1, "%03d", &n_bytes ); if( n_bytes == 0 || n_bytes >= STATUS_BYTES ) { - -printf("%s Ends %d\n",__FUNCTION__, __LINE__); gui->status_lock = 0; G_UNLOCK( status_lock__ ); return FALSE; @@ -5545,7 +5536,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__); nb = vj_client_read( gui->client, V_STATUS, gui->status_msg, n_bytes ); if(nb <= 0 ) { -printf("%s Ends %d\n",__FUNCTION__, __LINE__); gui->status_lock = 0; G_UNLOCK( status_lock__ ); return FALSE; @@ -5731,8 +5721,6 @@ void vj_fork_or_connect_veejay(char *configfile) while(args[f] != NULL) f++; args[f] = g_strdup( vims_token ); } -// for(k = 0 ; k < arglen; k ++ ) -// fprintf(stderr, "%s arg %d = '%s'\n", __FUNCTION__, k, args[k] ); if( info->watch.state == STATE_STOPPED) { // start local veejay @@ -5842,13 +5830,15 @@ static void vj_init_style( const char *name, const char *font ) GtkWidget *window = glade_xml_get_widget_(info->main_window, "gveejay_window"); GtkWidget *widget = glade_xml_get_widget_(info->main_window, name ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(widget), GTK_WRAP_WORD_CHAR ); - - GtkStyle *style = gtk_style_copy( gtk_widget_get_style(GTK_WIDGET(window))); - PangoFontDescription *desc = pango_font_description_from_string( font ); - pango_font_description_set_style( desc, PANGO_STYLE_NORMAL ); - style->font_desc = desc; - gtk_widget_set_style( widget, style ); - gtk_style_ref(style); + GdkColor red; + gdk_color_parse( "red", &red); +// GtkStyle *style = gtk_style_copy( gtk_widget_get_style(GTK_WIDGET(window))); +// PangoFontDescription *desc = pango_font_description_from_string( font ); +// pango_font_description_set_style( desc, PANGO_STYLE_NORMAL ); +// style->font_desc = desc; +// gtk_widget_set_style( widget, style ); +// gtk_style_ref(style); + gtk_widget_modify_bg( widget, GTK_STATE_NORMAL, &red ); } void vj_gui_style_setup() @@ -6151,9 +6141,12 @@ void vj_gui_init(char *glade_file) memset(&(info->watch.p_time),0,sizeof(struct timeval)); info->is_alive = g_timeout_add(G_PRIORITY_HIGH_IDLE,is_alive, (gpointer*)info); GtkWidget *w = glade_xml_get_widget_(info->main_window, "veejay_connection" ); + gtk_widget_show( w ); } + + static gboolean update_log(gpointer data) { if(info->watch.state != STATE_PLAYING && info->watch.p_state == 0) diff --git a/veejay-current/libsample/sampleadm.c b/veejay-current/libsample/sampleadm.c index 937c9eff..61b63b4e 100644 --- a/veejay-current/libsample/sampleadm.c +++ b/veejay-current/libsample/sampleadm.c @@ -242,8 +242,7 @@ sample_info *sample_skeleton_new(long startFrame, long endFrame) } si->sample_id = _new_id(); - - snprintf(si->descr,SAMPLE_MAX_DESCR_LEN, "%s", "Untitled"); + snprintf(si->descr,SAMPLE_MAX_DESCR_LEN, "Sample%04d", si->sample_id); si->first_frame = startFrame; si->last_frame = endFrame; si->edit_list = NULL; // clone later @@ -284,7 +283,6 @@ sample_info *sample_skeleton_new(long startFrame, long endFrame) si->selected_entry = 0; si->effect_toggle = 1; si->offset = 0; - sprintf(si->descr, "%s", "Untitled"); sprintf(tmp_file, "sample_%05d.edl", si->sample_id ); si->edit_list_file = strdup( tmp_file ); @@ -733,7 +731,7 @@ int sample_set_description(int sample_id, char *description) if (!si) return -1; if (!description || strlen(description) <= 0) { - snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "%s", "Untitled"); + snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "Sample%04d", si->sample_id ); } else { snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "%s", description); } diff --git a/veejay-current/libsamplerec/samplerecord.c b/veejay-current/libsamplerec/samplerecord.c index 3385b32d..ed045e27 100644 --- a/veejay-current/libsamplerec/samplerecord.c +++ b/veejay-current/libsamplerec/samplerecord.c @@ -92,7 +92,10 @@ int sample_try_filename(int sample_id, char *filename) { snprintf(si->encoder_base,255,"%s",filename); } - sprintf(si->encoder_destination, "%s-%05ld.avi", si->encoder_base,si->sequence_num); +// sprintf(si->encoder_destination, "%s-%05ld.avi", si->encoder_base,si->sequence_num); + + + sprintf(si->encoder_destination, "%s.avi", si->encoder_base ); veejay_msg(VEEJAY_MSG_INFO, "Recording to [%s]", si->encoder_destination); return (sample_update(si,sample_id)); diff --git a/veejay-current/libvje/effects/videowall.c b/veejay-current/libvje/effects/videowall.c index bc1ae495..e1c6d3ef 100644 --- a/veejay-current/libvje/effects/videowall.c +++ b/veejay-current/libvje/effects/videowall.c @@ -20,6 +20,7 @@ #include "videowall.h" #include #include "common.h" +static inline int gcd(int p, int q ) { if(q==0) return p; else return(gcd(q,p%q)); } static inline int n_pics(int w, int h) { @@ -60,7 +61,7 @@ static int frame_delay = 0; static int *offset_table_x = NULL; static int *offset_table_y = NULL; -static inline int gcd(int p, int q ) { if(q==0) return p; else return(gcd(q,p%q)); } + static int prepare_filmstrip(int w, int h) diff --git a/veejay-current/libvjnet/vj-server.c b/veejay-current/libvjnet/vj-server.c index 5f36caaa..38daaef1 100644 --- a/veejay-current/libvjnet/vj-server.c +++ b/veejay-current/libvjnet/vj-server.c @@ -426,7 +426,7 @@ int vj_server_poll(vj_server * vje) return 0; } -static int _vj_server_empty_queue(vj_server *vje, int link_id) +int _vj_server_empty_queue(vj_server *vje, int link_id) { // ensure message queue is empty!! vj_link **Link = (vj_link**) vje->link; diff --git a/veejay-current/share/gveejay.rc b/veejay-current/share/gveejay.rc index c3a068be..4225b074 100644 --- a/veejay-current/share/gveejay.rc +++ b/veejay-current/share/gveejay.rc @@ -1,7 +1,6 @@ # Edit these colors and fonts however you like. style "default" { - engine "hcengine" {} xthickness = 1 ythickness = 1 GtkWidget::shadow_type = GTK_SHADOW_ETCHED_OUT @@ -18,22 +17,27 @@ style "default" font_name = "Sans 8" - fg[NORMAL] = "#646464" # borders etc. - fg[PRELIGHT] = "#646464" - fg[ACTIVE] = "#646464" # ook borders, van sliders en notebook - fg[SELECTED] = "#646464" - fg[INSENSITIVE] = "#404040" - - bg[NORMAL] = "#27282F" # algemene achtergrond kleur - bg[PRELIGHT] = "#aaacc1" # achtergrond geselecteerd widget - bg[ACTIVE] = "#454f60" # niet actieve tabs, achtergrond sliders - bg[SELECTED] = "#5058a0" - bg[INSENSITIVE] = "#27282f" # achtergrond kleur van niet actieve knopjes + # foreground color of widgets - text[NORMAL] = "#d8d8d8" - text[PRELIGHT] = "#d8d8d8" - text[ACTIVE] = "#FF0000" - text[SELECTED] = "#FF0000" + fg[NORMAL] = "#646464" # normal + fg[PRELIGHT] = "#646464" # mouse on top of widget + fg[ACTIVE] = "#646464" # the widget is pressed or clicked (and active) + fg[SELECTED] = "#646464" # selected + fg[INSENSITIVE] = "#404040" # greyed out + + bg[NORMAL] = "#27282F" # see above + bg[PRELIGHT] = "#aaacc1" # + bg[ACTIVE] = "#454f60" # + bg[SELECTED] = "#5058a0" # + bg[INSENSITIVE] = "#27282f" # + + # set the color used for foreground of widgets using base for the background + + text[NORMAL] ="#171223" + text[PRELIGHT] = "#414174" + text[ACTIVE] = "#141444" +# text[SELECTED] = "#FF0000" + text[SELECTED] = "#0b0b46" text[INSENSITIVE] = "#404040" base[NORMAL] = "#37383f" @@ -41,78 +45,8 @@ style "default" base[ACTIVE] = "#757f90" base[SELECTED] = "#757ab3" base[INSENSITIVE] = "#27282f" - + bg_pixmap[NORMAL] = "bg.png" } -style "text" -{ - font_name = "Sans 8" - - fg[NORMAL] = "#ffffff" # borders etc. - fg[PRELIGHT] = "#ffffff" - fg[ACTIVE] = "#ffffff" # ook borders, van sliders en notebook - fg[SELECTED] = "#ffffff" - fg[INSENSITIVE] = "#ffffff" - - bg[NORMAL] = "#27282F" # algemene achtergrond kleur - bg[PRELIGHT] = "#aaacc1" # achtergrond geselecteerd widget - bg[ACTIVE] = "#454f60" # niet actieve tabs, achtergrond sliders - bg[SELECTED] = "#5058a0" - bg[INSENSITIVE] = "#27282f" # achtergrond kleur van niet actieve knopjes - - text[NORMAL] = "#d8d8d8" - text[PRELIGHT] = "#d8d8d8" - text[ACTIVE] = "#FF0000" - text[SELECTED] = "#FF0000" - text[INSENSITIVE] = "#404040" - - base[NORMAL] = "#37383f" - base[PRELIGHT] = "#aaacc1" - base[ACTIVE] = "#757f90" - base[SELECTED] = "#757ab3" - base[INSENSITIVE] = "#27282f" - -} - - -style "buttons" -{ - - font_name = "Sans 8" - - fg[NORMAL] = "#888888" - fg[PRELIGHT] = "#888888" - fg[ACTIVE] = "#888888" - fg[SELECTED] = "#888888" - fg[INSENSITIVE] = "#888888" - - bg[NORMAL] = "#27282F" - bg[PRELIGHT] = "#aaacc1" - bg[ACTIVE] = "#454f60" - bg[SELECTED] = "#5058a0" - bg[INSENSITIVE] = "#27282f" - - text[NORMAL] = "#d8d8d8" - text[PRELIGHT] = "#d8d8d8" - text[ACTIVE] = "#FF0000" - text[SELECTED] = "#FF0000" - text[INSENSITIVE] = "#404040" - - base[NORMAL] = "#37383f" - base[PRELIGHT] = "#aaacc1" - base[ACTIVE] = "#757f90" - base[SELECTED] = "#757ab3" - base[INSENSITIVE] = "#27282f" - -} - - - -class "GtkButton" style "buttons" -class "GtkSpinButton" style "buttons" -class "GtkToggleButton" style "buttons" -class "GtkCheckBox" style "buttons" - -class "GtkLabel" style "text" class "GtkWidget" style "default" diff --git a/veejay-current/share/gveejay.reloaded.glade b/veejay-current/share/gveejay.reloaded.glade index 81a028bd..9906a235 100644 --- a/veejay-current/share/gveejay.reloaded.glade +++ b/veejay-current/share/gveejay.reloaded.glade @@ -45,80 +45,6 @@ - - - True - New veejay session - True - - - - - True - gtk-execute - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Quick launch session - True - - - - - True - icon_connect.png - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Configure - True - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - True @@ -126,7 +52,7 @@ True - + True icon_save.png 0.5 @@ -147,7 +73,7 @@ - + True icon_saveas.png 0.5 @@ -167,7 +93,7 @@ - + True icon_openlist.png 0.5 @@ -190,7 +116,7 @@ True - + True icon_open.png 0.5 @@ -211,7 +137,7 @@ - + True icon_open.png 0.5 @@ -231,7 +157,7 @@ - + True icon_openlist.png 0.5 @@ -261,7 +187,7 @@ - + True icon_disconnect.png 0.5 @@ -273,26 +199,6 @@ - - - True - Kill veejay server - True - - - - - True - icon_skull.png - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -322,7 +228,7 @@ True - + True icon_loop.png 0.5 @@ -343,7 +249,7 @@ - + True icon_openlist.png 0.5 @@ -358,12 +264,13 @@ True - _Add file + Append a videofile to the sample's EDL + _Add videofile True - + True icon_send.png 0.5 @@ -383,7 +290,7 @@ - + True icon_copy.png 0.5 @@ -403,7 +310,7 @@ - + True icon_clear.png 0.5 @@ -426,7 +333,7 @@ True - + True icon_stream.png 0.5 @@ -442,12 +349,12 @@ True - _New source + _New True - + True icon_openlist.png 0.5 @@ -462,12 +369,12 @@ True - _New color + _New Solid True - + True icon_color.png 0.5 @@ -487,7 +394,7 @@ - + True icon_clear.png 0.5 @@ -512,12 +419,12 @@ True - Video settings + Settings True - + True gtk-preferences 1 @@ -551,7 +458,7 @@ - + True gtk-dialog-info 1 @@ -587,7 +494,7 @@ - + True icon_bundle.png 0.5 @@ -598,6 +505,27 @@ + + + + True + Configuration + True + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + @@ -620,7 +548,7 @@ - + True icon_question.png 0.5 @@ -1193,7 +1121,7 @@ True - Record duration + Duration False False GTK_JUSTIFY_LEFT @@ -1334,7 +1262,7 @@ True - Record format + Format False False GTK_JUSTIFY_LEFT @@ -1979,7 +1907,7 @@ YV16 True - <b>Hardware controls:</b> + <b>V4L</b> False True GTK_JUSTIFY_LEFT @@ -2052,7 +1980,7 @@ YV16 True - <b>Solid-stream Color</b> + <b>Color wheel</b> False True GTK_JUSTIFY_LEFT @@ -2361,7 +2289,7 @@ YV16 - Frame duplication ("delay") + Duplication factor False False GTK_JUSTIFY_LEFT @@ -2417,7 +2345,7 @@ YV16 - Sample name: + Title: False False GTK_JUSTIFY_LEFT @@ -2655,7 +2583,7 @@ YV16 True - Loop Types + Looping False True GTK_JUSTIFY_LEFT @@ -2747,7 +2675,7 @@ YV16 True - Record duration + Duration False False GTK_JUSTIFY_LEFT @@ -2797,7 +2725,7 @@ YV16 True - Record format + Format False False GTK_JUSTIFY_LEFT @@ -2872,29 +2800,6 @@ YV16 0 - - - - True - <b>Timecode:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - 2 @@ -2909,7 +2814,7 @@ YV16 True - Record duration as + Unit False True GTK_JUSTIFY_LEFT @@ -3165,7 +3070,7 @@ YV16 True - <b>Recording progress</b> + <b>Recording</b> False True GTK_JUSTIFY_LEFT @@ -3313,7 +3218,7 @@ YV16 True - Editlist positon + Positon False False GTK_JUSTIFY_LEFT @@ -3340,7 +3245,7 @@ YV16 True - Editlist frames + Total frames False False GTK_JUSTIFY_LEFT @@ -6539,7 +6444,7 @@ YV16 True - Mixing sources + FX sources False False GTK_JUSTIFY_LEFT @@ -6748,7 +6653,7 @@ YV16 True - Effects + FX List False False GTK_JUSTIFY_LEFT @@ -6801,7 +6706,7 @@ YV16 True - Color parameters + Color wheel False False GTK_JUSTIFY_LEFT @@ -6990,7 +6895,7 @@ YV16 True - <b>Keyframe Start</b> + <b>Time Start</b> False True GTK_JUSTIFY_LEFT @@ -7145,7 +7050,7 @@ YV16 True - <b>Keyframe End</b> + <b>Time End</b> False True GTK_JUSTIFY_LEFT @@ -7448,7 +7353,7 @@ YV16 True - <b>Keyframe parameter:</b> + <b>Animate parameter:</b> False True GTK_JUSTIFY_LEFT @@ -7593,7 +7498,7 @@ YV16 True - <b>Drawing method</b> + <b>Curve drawing method</b> False True GTK_JUSTIFY_LEFT @@ -7786,7 +7691,7 @@ YV16 True - Keyframing + FX animation False False GTK_JUSTIFY_LEFT @@ -8741,7 +8646,7 @@ YV16 True - Sample banks + Samplebank False False GTK_JUSTIFY_LEFT diff --git a/veejay-current/veejay/veejay.c b/veejay-current/veejay/veejay.c index 5f567efb..87bbd955 100644 --- a/veejay-current/veejay/veejay.c +++ b/veejay-current/veejay/veejay.c @@ -526,7 +526,7 @@ static int check_command_line_options(int argc, char *argv[]) static void print_license() { veejay_msg(VEEJAY_MSG_INFO, - "Veejay -<|End of the Line 2k6 beta 1|>- %s Copyright (C) Niels Elburg and others",VERSION); + "Veejay -<|End of the Line 2k6 beta 2|>- %s Copyright (C) Niels Elburg and others",VERSION); veejay_msg(VEEJAY_MSG_INFO, "This software is subject to the GNU GENERAL PUBLIC LICENSE");