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

default tracks is 2, fix vims 240, order is num,channel not channel,num

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1212 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-11-23 00:29:11 +00:00
parent b7275510c0
commit c6f126e3e4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ static int verbosity = 0;
static int timer = 6; static int timer = 6;
static int col = 0; static int col = 0;
static int row = 0; static int row = 0;
static int n_tracks = 1; static int n_tracks = 2;
static int launcher = 0; static int launcher = 0;
static int pw = 176; static int pw = 176;
static int ph = 144; static int ph = 144;

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

@@ -929,8 +929,8 @@ void on_devicelist_row_activated(GtkTreeView *treeview,
gint num = info->uc.strtmpl[0].dev; gint num = info->uc.strtmpl[0].dev;
multi_vims( VIMS_STREAM_NEW_V4L,"%d %d", multi_vims( VIMS_STREAM_NEW_V4L,"%d %d",
channel, num,
num channel
); );
gveejay_new_slot(MODE_STREAM); gveejay_new_slot(MODE_STREAM);
@@ -3995,7 +3995,7 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
strncpy( descr, line + 22, values[6] ); strncpy( descr, line + 22, values[6] );
switch( values[1] ) switch( values[1] )
{ {
case STREAM_VIDEO4LINUX :sprintf(source,"unicap %d",values[0]);break; case STREAM_VIDEO4LINUX :sprintf(source,"capture %d",values[0]);break;
case STREAM_WHITE :sprintf(source,"solid %d",values[0]); case STREAM_WHITE :sprintf(source,"solid %d",values[0]);
break; break;
case STREAM_MCAST :sprintf(source,"multicast %d",values[0]);break; case STREAM_MCAST :sprintf(source,"multicast %d",values[0]);break;