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

bump version, fixed wait for more in load samplelist when loading many samples

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1286 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-12-30 00:54:43 +00:00
parent a19b6be4cf
commit f97a97d291
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
veejay-current/veejay-client/configure.ac
View File

@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl AC_INIT dnl AC_INIT
AC_INIT([gveejay],[1.4.6],[veejay-users@lists.sourceforge.net]) AC_INIT([gveejay],[1.4.7],[veejay-users@lists.sourceforge.net])
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_CONFIG_SRCDIR([src/gveejay.c]) AC_CONFIG_SRCDIR([src/gveejay.c])
GVEEJAY_MAJOR_VERSION=1 GVEEJAY_MAJOR_VERSION=1
GVEEJAY_MINOR_VERSION=4 GVEEJAY_MINOR_VERSION=4
GVEEJAY_MICRO_VERSION=6 GVEEJAY_MICRO_VERSION=7
GVEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION GVEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION
GVEEJAY_CODENAME="Reloaded - build $GVEEJAY_MAJOR_VERSION $GVEEJAY_MINOR_VERSION $GVEEJAY_MICRO_VERSION" GVEEJAY_CODENAME="Reloaded - build $GVEEJAY_MAJOR_VERSION $GVEEJAY_MINOR_VERSION $GVEEJAY_MICRO_VERSION"
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@@ -178,7 +178,7 @@ fi
dnl Check for Veejay dnl Check for Veejay
have_veejay=false have_veejay=false
PKG_CHECK_MODULES( VEEJAY, [veejay >= 1.4.3 ], PKG_CHECK_MODULES( VEEJAY, [veejay >= 1.4.5 ],
[ [
AC_SUBST(VEEJAY_CFLAGS) AC_SUBST(VEEJAY_CFLAGS)
AC_SUBST(VEEJAY_LIBS) AC_SUBST(VEEJAY_LIBS)
@@ -188,7 +188,13 @@ PKG_CHECK_MODULES( VEEJAY, [veejay >= 1.4.3 ],
[have_veejay=false]) [have_veejay=false])
if test x$have_veejay != xtrue ; then if test x$have_veejay != xtrue ; then
AC_MSG_ERROR([Cannot find Veejay.]) PKG_CHECK_MODULES(VEEJAY, [veejay <= 1.4.5 ],
[
AC_MSG_ERROR([veejay-server too old!])
],
[
AC_MSG_ERROR([Cannot find veejay])
])
fi fi
have_pixbuf=false have_pixbuf=false

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

@@ -1985,7 +1985,9 @@ int gveejay_new_slot(int mode)
int bank_page = 0; int bank_page = 0;
if(verify_bank_capacity( &bank_page, &poke_slot, id, mode )) if(verify_bank_capacity( &bank_page, &poke_slot, id, mode ))
{ {
sample_slot_t *tmp_slot = vj_gui_get_sample_info(id, mode ); info->uc.reload_hint[HINT_SLIST] = 1;
/* sample_slot_t *tmp_slot = vj_gui_get_sample_info(id, mode );
if(tmp_slot) if(tmp_slot)
{ {
tmp_slot->slot_number = poke_slot; tmp_slot->slot_number = poke_slot;
@@ -1993,7 +1995,7 @@ int gveejay_new_slot(int mode)
free_slot( tmp_slot ); free_slot( tmp_slot );
info->uc.expected_slots ++; info->uc.expected_slots ++;
return id; return id;
} }*/
} }
else else
{ {
@@ -2101,7 +2103,6 @@ static void multi_vims(int id, const char format[],...)
if(vj_client_send( info->client, V_CMD, block)<=0 ) if(vj_client_send( info->client, V_CMD, block)<=0 )
reloaded_schedule_restart(); reloaded_schedule_restart();
} }
static void single_vims(int id) static void single_vims(int id)
@@ -2128,7 +2129,6 @@ static gchar *recv_vims(int slen, int *bytes_written)
if( ret <= 0 || len <= 0 || slen <= 0) if( ret <= 0 || len <= 0 || slen <= 0)
return (gchar*)result; return (gchar*)result;
result = (unsigned char*) vj_calloc(sizeof(unsigned char) * (len + 1) ); result = (unsigned char*) vj_calloc(sizeof(unsigned char) * (len + 1) );
*bytes_written = vj_client_read( info->client, V_CMD, result, len ); *bytes_written = vj_client_read( info->client, V_CMD, result, len );
if( *bytes_written == -1 ) if( *bytes_written == -1 )
reloaded_schedule_restart(); reloaded_schedule_restart();
@@ -3989,13 +3989,14 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
multi_vims( VIMS_SAMPLE_LIST,"%d", 0 ); multi_vims( VIMS_SAMPLE_LIST,"%d", 0 );
gint fxlen = 0; gint fxlen = 0;
gchar *fxtext = recv_vims(5,&fxlen); gchar *fxtext = recv_vims(8,&fxlen);
if(fxlen > 0 && fxtext != NULL) if(fxlen > 0 && fxtext != NULL)
{ {
has_samples = 1; has_samples = 1;
while( offset < fxlen ) while( offset < fxlen )
{ {
char tmp_len[4]; char tmp_len[8];
veejay_memset(tmp_len,0,sizeof(tmp_len)); veejay_memset(tmp_len,0,sizeof(tmp_len));
strncpy(tmp_len, fxtext + offset, 3 ); strncpy(tmp_len, fxtext + offset, 3 );
int len = atoi(tmp_len); int len = atoi(tmp_len);
@@ -4009,8 +4010,18 @@ static void load_samplelist_info(gboolean with_reset_slotselection)
strncpy( line, fxtext + offset, len ); strncpy( line, fxtext + offset, len );
int values[4]; int values[4];
#ifdef STRICT_CHECKING
veejay_msg( VEEJAY_MSG_DEBUG, "[%s]", line);
int res = sscanf( line, "%05d%09d%09d%03d",
&values[0], &values[1], &values[2], &values[3]);
veejay_msg(VEEJAY_MSG_DEBUG,
"%d , %d, %d, %d res=%d",values[0],values[1],
values[2],values[3],res );
assert( res == 4 );
#else
sscanf( line, "%05d%09d%09d%03d", sscanf( line, "%05d%09d%09d%03d",
&values[0], &values[1], &values[2], &values[3]); &values[0], &values[1], &values[2], &values[3]);
#endif
strncpy( descr, line + 5 + 9 + 9 + 3 , values[3] ); strncpy( descr, line + 5 + 9 + 9 + 3 , values[3] );
gchar *title = _utf8str( descr ); gchar *title = _utf8str( descr );
gchar *timecode = format_selection_time( 0,(values[2]-values[1]) ); gchar *timecode = format_selection_time( 0,(values[2]-values[1]) );
@@ -7035,7 +7046,7 @@ sample_slot_t *vj_gui_get_sample_info(gint which_one, gint mode )
multi_vims( VIMS_SAMPLE_INFO, "%d %d", which_one, mode ); multi_vims( VIMS_SAMPLE_INFO, "%d %d", which_one, mode );
gint sample_info_len = 0; gint sample_info_len = 0;
gchar *sample_info = recv_vims( 5, &sample_info_len); gchar *sample_info = recv_vims( 8, &sample_info_len);
gint descr_len = 0; gint descr_len = 0;
gchar *p = sample_info; gchar *p = sample_info;