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

Merge branch 'master' of code.dyne.org:veejay

Browse Source 
Conflicts:
	veejay-current/veejay-client/configure.ac
	veejay-current/veejay-server/configure.ac
	veejay-current/veejay-server/libel/vj-avcodec.c
	veejay-current/veejay-server/libel/vj-el.c
	veejay-current/veejay-server/libstream/v4l2utils.c
	veejay-current/veejay-server/libvje/effects/chameleon.c
This commit is contained in:
niels
2014-11-22 20:59:53 +01:00
parent 3057db6d5d 136a4bf5dc
commit 8d2ce16227
63 changed files with 1381 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
veejay-current/veejay-client/src/callback.c
View File

@@ -1357,6 +1357,7 @@ void on_vims_take_clicked(GtkWidget *widget, gpointer user_data)
}
void on_button_key_detach_clicked(GtkWidget *widget, gpointer user)
{
#ifdef HAVE_SDL
int key_val = info->uc.pressed_key;
int key_mod = info->uc.pressed_mod;
@@ -1374,10 +1375,12 @@ void on_button_key_detach_clicked(GtkWidget *widget, gpointer user)
else
vj_msg(VEEJAY_MSG_INFO, "Key binding %s released", strkey );
}
#endif
}
void on_vims_key_clicked( GtkWidget *widget, gpointer user_data)
{
#ifdef HAVE_SDL
char which_vims[128];
sprintf(which_vims, "Press a key to bind VIMS %03d",
info->uc.selected_vims_entry );
@@ -1409,6 +1412,7 @@ void on_vims_key_clicked( GtkWidget *widget, gpointer user_data)
event_id, sdlkey_by_id(key_val) );
}
}
#endif
}