eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-20 14:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

added encoder formats

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1250 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-12-10 23:31:54 +00:00
parent 2579650c76
commit 165ee9db19
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
veejay-current/veejay-client/share/reloaded_classic.glade
View File

@@ -19,7 +19,6 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<child> <child>
<widget class="GtkVBox" id="vbox594"> <widget class="GtkVBox" id="vbox594">
@@ -36,8 +35,6 @@
<child> <child>
<widget class="GtkMenuBar" id="menubar1"> <widget class="GtkMenuBar" id="menubar1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
<property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
<child> <child>
<widget class="GtkMenuItem" id="menuitem8"> <widget class="GtkMenuItem" id="menuitem8">
@@ -7938,7 +7935,7 @@ MLZO</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
@@ -7958,7 +7955,7 @@ MLZO</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
@@ -12790,7 +12787,6 @@ MLZO</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">False</property> <property name="has_separator">False</property>
<accessibility> <accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Reloaded Launcher</atkproperty> <atkproperty name="AtkObject::accessible_name" translatable="yes">Reloaded Launcher</atkproperty>
@@ -13332,7 +13328,6 @@ MLZO</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">True</property> <property name="has_separator">True</property>
<signal name="close" handler="on_vims_bundles_close" last_modification_time="Sat, 23 Jul 2005 19:06:53 GMT"/> <signal name="close" handler="on_vims_bundles_close" last_modification_time="Sat, 23 Jul 2005 19:06:53 GMT"/>
<signal name="delete_event" handler="on_vims_bundles_close" last_modification_time="Sat, 23 Jul 2005 19:07:04 GMT"/> <signal name="delete_event" handler="on_vims_bundles_close" last_modification_time="Sat, 23 Jul 2005 19:07:04 GMT"/>
@@ -14049,7 +14044,6 @@ MLZO</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">True</property> <property name="has_separator">True</property>
<signal name="close" handler="on_video_options_close" last_modification_time="Sat, 23 Jul 2005 16:25:01 GMT"/> <signal name="close" handler="on_video_options_close" last_modification_time="Sat, 23 Jul 2005 16:25:01 GMT"/>
<signal name="delete_event" handler="on_video_options_close" last_modification_time="Sat, 23 Jul 2005 18:51:08 GMT"/> <signal name="delete_event" handler="on_video_options_close" last_modification_time="Sat, 23 Jul 2005 18:51:08 GMT"/>
@@ -15256,7 +15250,6 @@ MLZO</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_inputstream_window_delete_event" last_modification_time="Mon, 10 Oct 2005 13:26:52 GMT"/> <signal name="delete_event" handler="on_inputstream_window_delete_event" last_modification_time="Mon, 10 Oct 2005 13:26:52 GMT"/>
<child> <child>
@@ -15896,7 +15889,6 @@ MLZO</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<child> <child>
<widget class="GtkVBox" id="vbox517"> <widget class="GtkVBox" id="vbox517">

2
veejay-current/veejay-client/src/sequence.c
View File

@@ -115,7 +115,7 @@ void *gvr_preview_init(int max_tracks, int use_threads)
vp->n_tracks = max_tracks; vp->n_tracks = max_tracks;
yuv_init_lib(); yuv_init_lib(0,0,0);
return (void*) vp; return (void*) vp;
} }

14
veejay-current/veejay-client/src/vj-api.c
View File

@@ -94,6 +94,8 @@ static struct
{ NULL, 0 } { NULL, 0 }
}; };
#define MAX_SLOW 100
static struct static struct
{ {
const char *text; const char *text;
@@ -2795,6 +2797,9 @@ static void update_current_slot(int *history, int pm, int last_pm)
put_text( "entry_samplename", "" ); put_text( "entry_samplename", "" );
set_pm_page_label( info->status_tokens[CURRENT_ID], pm ); set_pm_page_label( info->status_tokens[CURRENT_ID], pm );
//HERE
} }
if( info->status_tokens[CURRENT_ENTRY] != history[CURRENT_ENTRY] || if( info->status_tokens[CURRENT_ENTRY] != history[CURRENT_ENTRY] ||
info->uc.reload_hint[HINT_ENTRY] == 1 ) info->uc.reload_hint[HINT_ENTRY] == 1 )
@@ -2952,7 +2957,7 @@ static void update_current_slot(int *history, int pm, int last_pm)
if(speed < 0 ) info->play_direction = -1; else info->play_direction = 1; if(speed < 0 ) info->play_direction = -1; else info->play_direction = 1;
if(speed < 0 ) speed *= -1; if(speed < 0 ) speed *= -1;
update_spin_range( "spin_samplespeed", 0, len, speed ); update_spin_range( "spin_samplespeed", -1 * len, len, speed );
gchar *time = format_selection_time( 0, len ); gchar *time = format_selection_time( 0, len );
g_free(time); g_free(time);
@@ -6733,9 +6738,10 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num)
info->play_direction = -1; else info->play_direction=1; info->play_direction = -1; else info->play_direction=1;
if( speed < 0 ) speed *= -1; if( speed < 0 ) speed *= -1;
update_spin_range( "spin_framedelay", 1, 13, 0); update_spin_range( "spin_framedelay", 1, MAX_SLOW, 0);
update_slider_range( "speed_slider", -13,13,speed,0); update_spin_range( "spin_samplespeed", -25,25,1);
update_slider_range( "slow_slider",1,100,1,0); update_slider_range( "speed_slider", -25,25,speed,0);
update_slider_range( "slow_slider",1,MAX_SLOW,1,0);
update_label_str( "label_hostnamex", (hostname == NULL ? group_name: hostname ) ); update_label_str( "label_hostnamex", (hostname == NULL ? group_name: hostname ) );
update_label_i( "label_portx",port_num,0); update_label_i( "label_portx",port_num,0);