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

delete default fallback fonts

Browse Source
This commit is contained in:
c0ntrol
2019-05-28 00:44:04 +02:00
parent 3918e0cb8e
commit 561d06e8b0
2 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -151,7 +151,7 @@ void veejay_set_instance( veejay_t *info )
veejay_instance_ = info; veejay_instance_ = info;
} }
static void veejay_playback_close(veejay_t *info);
static void veejay_schedule_fifo( veejay_t *info, int pid ); static void veejay_schedule_fifo( veejay_t *info, int pid );
static int total_mem_mb_ = 0; static int total_mem_mb_ = 0;
@@ -378,6 +378,8 @@ int veejay_free(veejay_t * info)
{ {
video_playback_setup *settings = (video_playback_setup *) info->settings; video_playback_setup *settings = (video_playback_setup *) info->settings;
veejay_playback_close(info);
vj_mem_threaded_stop(); vj_mem_threaded_stop();
vj_event_destroy(info); vj_event_destroy(info);
@@ -2524,26 +2526,11 @@ static void Welcome(veejay_t *info)
"If you want to start a new project, start veejay in an empty directory"); "If you want to start a new project, start veejay in an empty directory");
} }
} }
static void *veejay_playback_thread(void *data)
static void veejay_playback_close(veejay_t *info)
{ {
veejay_t *info = (veejay_t *) data;
int i; int i;
sigset_t mask;
struct sigaction act;
sigemptyset(&mask);
sigaddset( &mask, SIGPIPE );
act.sa_handler = donothing2;
act.sa_flags = SA_SIGINFO | SA_ONESHOT;
sigemptyset(&act.sa_mask);
pthread_sigmask( SIG_BLOCK, &mask, NULL );
veejay_schedule_fifo( info, getpid());
Welcome(info);
veejay_playback_cycle(info);
veejay_close(info);
if(info->uc->is_server) { if(info->uc->is_server) {
for(i = 0; i < 4; i ++ ) for(i = 0; i < 4; i ++ )
if(info->vjs[i]) vj_server_shutdown(info->vjs[i]); if(info->vjs[i]) vj_server_shutdown(info->vjs[i]);
@@ -2607,9 +2594,36 @@ static void *veejay_playback_thread(void *data)
vj_font_destroy( info->osd ); vj_font_destroy( info->osd );
#endif #endif
veejay_msg(VEEJAY_MSG_DEBUG,"Exiting playback thread");
vj_perform_free(info); vj_perform_free(info);
}
static void *veejay_playback_thread(void *data)
{
veejay_t *info = (veejay_t *) data;
int i;
sigset_t mask;
struct sigaction act;
sigemptyset(&mask);
sigaddset( &mask, SIGPIPE );
act.sa_handler = donothing2;
act.sa_flags = SA_SIGINFO | SA_ONESHOT;
sigemptyset(&act.sa_mask);
pthread_sigmask( SIG_BLOCK, &mask, NULL );
veejay_schedule_fifo( info, getpid());
Welcome(info);
veejay_playback_cycle(info);
veejay_close(info);
// veejay_playback_close(info);
veejay_msg(VEEJAY_MSG_DEBUG,"Exiting playback thread");
pthread_exit(NULL); pthread_exit(NULL);
return NULL; return NULL;
} }

4
veejay-current/veejay-server/veejay/vj-font.c
View File

@@ -1354,7 +1354,6 @@ static int configure(vj_font_t *f, int size, int font)
fallback_font( f ); fallback_font( f );
} }
// veejay_msg(VEEJAY_MSG_DEBUG, "Using font %s, size %d (#%d)", f->font, size, font );
veejay_memset( selected_default_font, 0, sizeof(selected_default_font)); veejay_memset( selected_default_font, 0, sizeof(selected_default_font));
strncpy( selected_default_font, (char*)f->font,strlen((char*)f->font)) ; strncpy( selected_default_font, (char*)f->font,strlen((char*)f->font)) ;
@@ -1469,9 +1468,8 @@ static int get_default_font( vj_font_t *f )
{ {
char *name; char *name;
} default_fonts[] = { } default_fonts[] = {
{ "Arab (Regular)"},
{ "Mashq (Regular)" },
{ "DejaVu Sans (Bold)" }, { "DejaVu Sans (Bold)" },
{ "FreeMono" },
{ NULL }, { NULL },
}; };
int i,j; int i,j;