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

i686 build fixes, ffmpeg updates

Browse Source
This commit is contained in:
Niels Elburg
2016-01-10 21:11:05 +01:00
parent 8e911045d8
commit c58807d074
35 changed files with 147 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,8 @@
#include <veejay/vj-client.h>
#include <veejay/vj-msg.h>
#include <veejay/vims.h>
#include <veejay/avcommon.h>
#include <veejay/vevo.h>
#include <src/vj-api.h>
#include <fcntl.h>
#include "mpegconsts.h"
@@ -72,7 +74,6 @@
#include <libavutil/pixfmt.h>
#include <veejay/vevo.h>
#include <veejay/libvevo.h>
#include <veejay/vevo.h>
#include <src/vmidi.h>
//if gtk2_6 is not defined, 2.4 is assumed.
#ifdef GTK_CHECK_VERSION
@@ -4479,7 +4480,7 @@ void load_effectlist_info()
char *newName = vj_calloc( len );
veejay_memcpy(newName,ec->description+6, len-6 );
gtk_list_store_set( store3,&iter, FX_STRING, newName, -1 );
vevo_property_set( fx_list_, newName, LIVIDO_ATOM_TYPE_INT,1,&(ec->id));
vevo_property_set( fx_list_, newName, VEVO_ATOM_TYPE_INT,1,&(ec->id));
free(newName);
}
else
@@ -4489,14 +4490,14 @@ void load_effectlist_info()
{
gtk_list_store_append( store2, &iter );
gtk_list_store_set( store2, &iter, FX_STRING, name, -1 );
vevo_property_set( fx_list_, name, LIVIDO_ATOM_TYPE_INT, 1, &(ec->id));
vevo_property_set( fx_list_, name, VEVO_ATOM_TYPE_INT, 1, &(ec->id));
}
else
{
// tree_effectlist
gtk_list_store_append( store, &iter );
gtk_list_store_set( store, &iter, FX_STRING, name, -1 );
vevo_property_set( fx_list_, name, LIVIDO_ATOM_TYPE_INT, 1, &(ec->id));
vevo_property_set( fx_list_, name, VEVO_ATOM_TYPE_INT, 1, &(ec->id));
}
}
}