diff --git a/veejay-current/veejay-client/src/gveejay.c b/veejay-current/veejay-client/src/gveejay.c index ae553f19..dafb8ffa 100644 --- a/veejay-current/veejay-client/src/gveejay.c +++ b/veejay-current/veejay-client/src/gveejay.c @@ -158,12 +158,13 @@ gboolean gveejay_idle(gpointer data) if( gveejay_time_to_sync( get_ui_info() ) ) { veejay_update_multitrack( get_ui_info() ); - update_gveejay(); } } else { - gveejay_sleep( get_ui_info() ); + // gveejay_sleep( get_ui_info() ); } + update_gveejay(); + } if( gveejay_restart() ) diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 5f8cc906..c3d13c14 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -5641,7 +5641,8 @@ GdkPixbuf *vj_gdk_pixbuf_scale_simple( GdkPixbuf *src, int dw, int dh, GdkInterp void gveejay_sleep( void *u ) { struct timespec nsecsleep; - nsecsleep.tv_nsec = 1000000 * 4; +// nsecsleep.tv_nsec = 1000000 * 4; //@ too long + nsecsleep.tv_nsec = 500000; nsecsleep.tv_sec = 0; nanosleep( &nsecsleep, NULL ); } diff --git a/veejay-current/veejay-client/src/vj-midi.c b/veejay-current/veejay-client/src/vj-midi.c index 70c5fff5..bc391f63 100644 --- a/veejay-current/veejay-client/src/vj-midi.c +++ b/veejay-current/veejay-client/src/vj-midi.c @@ -125,7 +125,7 @@ void vj_midi_reset( void *vv ) } free(items); - vevo_port_free(v->vims); + vpf(v->vims); v->vims = vpn(VEVO_ANONYMOUS_PORT); diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index c5a0a67c..270209c5 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -5900,9 +5900,12 @@ void vj_event_chain_entry_source(void *ptr, const char format[], va_list ap) { sample_set_chain_channel(args[0],args[1], c); sample_set_chain_source (args[0],args[1],src); - - veejay_msg(VEEJAY_MSG_INFO, "Mixing with source (%s %d)", - src == VJ_TAG_TYPE_NONE ? "sample" : "stream",c); + int sample_offset = sample_get_offset(args[0],args[1]); + int sample_speed = 0; + if( src == VJ_TAG_TYPE_NONE ) + sample_speed = sample_get_speed(c); + veejay_msg(VEEJAY_MSG_INFO, "Mixing with source (%s %d) at speed %d position %d", + src == VJ_TAG_TYPE_NONE ? "sample" : "stream",c,sample_speed,sample_offset); // if(v->no_bezerk) veejay_set_sample(v, v->uc->sample_id); if(v->no_bezerk) { @@ -5958,8 +5961,13 @@ void vj_event_chain_entry_source(void *ptr, const char format[], va_list ap) { vj_tag_set_chain_channel(args[0],args[1], c); vj_tag_set_chain_source (args[0],args[1],src); - veejay_msg(VEEJAY_MSG_INFO, "Mixing with source (%s %d)", - src==VJ_TAG_TYPE_NONE ? "sample" : "stream",c); + int sample_offset = vj_tag_get_offset(args[0],args[1]); + int sample_speed = 0; + if( src == VJ_TAG_TYPE_NONE ) + sample_speed = sample_get_speed(c); + + veejay_msg(VEEJAY_MSG_INFO, "Mixing with source (%s %d) at speed %d position %d", + src==VJ_TAG_TYPE_NONE ? "sample" : "stream",c,sample_speed, sample_offset); // if(v->no_bezerk) veejay_set_sample(v, v->uc->sample_id); } @@ -8179,10 +8187,16 @@ void vj_event_print_sample_info(veejay_t *v, int id) if (vj_effect_get_extra_frame(y) == 1) { int source = sample_get_chain_source(id, i); - - veejay_msg(VEEJAY_MSG_PRINT, "I:\t\t\t Mixing with %s %d\n",(source == VJ_TAG_TYPE_NONE ? "sample" : "stream"), - sample_get_chain_channel(id,i) - ); + int sample_offset = sample_get_offset(id,i); + int c = sample_get_chain_channel(id,i); + int sample_speed = 0; + if( source == VJ_TAG_TYPE_NONE ) + sample_speed = sample_get_speed(c); + + veejay_msg(VEEJAY_MSG_PRINT, "I:\t\t\t Mixing with %s %d at speed %d, position %d\n",(source == VJ_TAG_TYPE_NONE ? "sample" : "stream"), + c, + sample_speed, + sample_offset ); } } }