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

Reloaded - Add toogle_fx_chain siamese to chain panel

Browse Source
This commit is contained in:
Jerome Blanchi aka d.j.a.y
2019-05-29 11:37:23 +02:00
parent 5f224e72f3
commit 89ac9ddf9f
3 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
veejay-current/reloaded-gtk3/share/gveejay.reloaded.glade
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<!-- interface-css-provider-path gveejay.reloaded.css -->
@@ -8,18 +8,12 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<object class="GtkApplicationWindow">
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<object class="GtkAdjustment" id="calibration_duration">
<property name="lower">2</property>
@@ -149,9 +143,6 @@
<property name="default_height">400</property>
<property name="icon">icon_stream.png</property>
<signal name="delete-event" handler="on_generator_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkFrame" id="frame_generator">
<property name="visible">True</property>
@@ -1483,6 +1474,12 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkButton" id="generators_close">
<property name="visible">True</property>
@@ -1614,9 +1611,6 @@
<property name="can_focus">False</property>
<property name="title" translatable="yes">Image Calibration</property>
<signal name="delete-event" handler="on_calibration_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="vbox637">
<property name="visible">True</property>
@@ -2457,9 +2451,6 @@
<property name="default_height">400</property>
<property name="icon">icon_stream.png</property>
<signal name="delete-event" handler="on_inputstream_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkFrame" id="frame161">
<property name="width_request">340</property>
@@ -2832,9 +2823,6 @@
<property name="type_hint">dialog</property>
<signal name="close" handler="on_veejay_connection_close" swapped="no"/>
<signal name="delete-event" handler="on_veejay_connection_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
@@ -3306,9 +3294,6 @@
<property name="type_hint">dialog</property>
<signal name="close" handler="on_video_options_close" swapped="no"/>
<signal name="delete-event" handler="on_video_options_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox_video_options">
<property name="visible">True</property>
@@ -4174,9 +4159,6 @@
<property name="type_hint">dialog</property>
<signal name="close" handler="on_vims_bundles_close" swapped="no"/>
<signal name="delete-event" handler="on_vims_bundles_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox5">
<property name="visible">True</property>
@@ -4573,9 +4555,6 @@
<property name="can_focus">False</property>
<property name="title" translatable="yes">Reloaded</property>
<property name="icon">veejay-icon.png</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="veejay_box">
<property name="visible">True</property>
@@ -17190,6 +17169,7 @@ Events may not always be triggered if veejay is configured to keep in sync (hard
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Toggle rendering of FX chain on mixing sources</property>
<property name="margin_left">20</property>
<signal name="toggled" handler="on_subrender_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="image18">
@@ -17205,29 +17185,6 @@ Events may not always be triggered if veejay is configured to keep in sync (hard
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_fx_clearchain">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Clear Chain</property>
<signal name="clicked" handler="on_button_fx_clearchain_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image162">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clearall.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">20</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="curve_chain_toggleentry">
<property name="visible">True</property>
@@ -17244,6 +17201,29 @@ Events may not always be triggered if veejay is configured to keep in sync (hard
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_fx_clearchain">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Clear Chain</property>
<property name="margin_left">20</property>
<signal name="clicked" handler="on_button_fx_clearchain_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image162">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clearall.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -17251,7 +17231,26 @@ Events may not always be triggered if veejay is configured to keep in sync (hard
</packing>
</child>
<child>
<placeholder/>
<object class="GtkToggleButton" id="curve_chain_togglechain">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Enable/disable effectchain</property>
<property name="margin_right">20</property>
<signal name="clicked" handler="on_check_samplefx_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image61">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_keyframe.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">8</property>
</packing>
</child>
<child>
<placeholder/>

4
veejay-current/reloaded-gtk3/src/callback.c
View File

@@ -1684,8 +1684,8 @@ void on_check_samplefx_clicked(GtkWidget *widget , gpointer user_data)
if(!info->status_lock)
{
int vims_id = VIMS_SAMPLE_CHAIN_DISABLE;
if( is_button_toggled( "check_samplefx" ) )
if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ) == TRUE )
vims_id = VIMS_SAMPLE_CHAIN_ENABLE;
multi_vims( vims_id, "%d", 0 );

13
veejay-current/reloaded-gtk3/src/vj-api.c
View File

@@ -318,6 +318,7 @@ enum {
WIDGET_SLIDER_BOX_G9 = 216,
WIDGET_SLIDER_BOX_G10 = 217,
WIDGET_VEEJAY_BOX = 230,
WIDGET_CURVE_CHAIN_TOGGLECHAIN = 231,
};
@@ -693,6 +694,7 @@ static struct
{ "slider_box_p8", WIDGET_SLIDER_BOX_G8 },
{ "slider_box_p9", WIDGET_SLIDER_BOX_G9 },
{ "slider_box_p10", WIDGET_SLIDER_BOX_G10 },
{ "curve_chain_togglechain", WIDGET_CURVE_CHAIN_TOGGLECHAIN },
{ NULL, -1 },
};
@@ -4925,6 +4927,15 @@ static void load_effectchain_info()
GtkTreeModel *model = gtk_tree_view_get_model( GTK_TREE_VIEW(tree ));
store = GTK_LIST_STORE(model);
//update chain fx status
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CURVE_CHAIN_TOGGLECHAIN]), info->status_tokens[SAMPLE_FX] );
//also for stream (index is equivalent)
if(info->status_tokens[PLAY_MODE] == MODE_SAMPLE){
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CHECK_SAMPLEFX]), info->status_tokens[SAMPLE_FX] );
} else {
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CHECK_STREAMFX]), info->status_tokens[SAMPLE_FX] );
}
// no fx, clean list and return
if(fxlen <= 0 )
{
@@ -7906,6 +7917,8 @@ static void process_reload_hints(int *history, int pm)
{
if( history[SAMPLE_FX] != info->status_tokens[SAMPLE_FX])
{
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CURVE_CHAIN_TOGGLECHAIN]), info->status_tokens[SAMPLE_FX] );
//also for stream (index is equivalent)
if(pm == MODE_SAMPLE)
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget_cache[WIDGET_CHECK_SAMPLEFX]), info->status_tokens[SAMPLE_FX] );