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

bugfix

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1143 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-11-02 01:17:13 +00:00
parent 1f57e0e367
commit 57c09e613c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
veejay-1.3/veejay-server/libsample/sampleadm.c
View File

@@ -1467,6 +1467,10 @@ int sample_set_composite(void *compiz, int s1, int composite)
sample_info *sample = sample_get(s1);
if(!sample) return -1;
sample->composite = composite;
if(sample->viewport_config == NULL) {
sample->composite = 1;
return sample_update(sample,s1);
}
#ifdef STRICT_CHECKING
assert( sample->viewport_config != NULL );
assert( composite != 0 );
@@ -1479,7 +1483,7 @@ int sample_set_composite(void *compiz, int s1, int composite)
int sample_get_composite(int s1)
{
sample_info *sample = sample_get(s1);
if(!sample) return -1;
if(!sample) return 0;
return sample->composite;
}
/****************************************************************************************************

6
veejay-1.3/veejay-server/libstream/vj-tag.c
View File

@@ -492,7 +492,7 @@ int vj_tag_set_stream_color(int t1, int r, int g, int b)
int vj_tag_get_composite(int t1)
{
vj_tag *tag = vj_tag_get(t1);
if(!tag) return -1;
if(!tag) return 0;
return tag->composite;
}
@@ -936,6 +936,10 @@ int vj_tag_set_composite( void *compiz,int t1, int n )
vj_tag *tag = vj_tag_get(t1);
if(!tag) return -1;
tag->composite = n;
if( tag->viewport_config == NULL ) {
tag->composite = 1;
return (vj_tag_update(tag,t1));
}
#ifdef STRICT_CHECKING
assert( tag->viewport_config != NULL );
assert( n > 0 );

3
veejay-1.3/veejay-server/veejay/vj-event.c
View File

@@ -3364,6 +3364,7 @@ void vj_event_play_stop(void *ptr, const char format[], va_list ap)
void vj_event_viewport_composition( void *ptr, const char format[], va_list ap )
{
veejay_t *v = (veejay_t*) ptr;
if(v->composite) {
if(STREAM_PLAYING(v))
{
int status = vj_tag_get_composite( v->uc->sample_id );
@@ -3389,7 +3390,7 @@ void vj_event_viewport_composition( void *ptr, const char format[], va_list ap )
v->uc->sample_id, (status==2? "now" : "not"));
}
}
}
void vj_event_play_reverse(void *ptr,const char format[],va_list ap)