From 17a82a0343b90ed80da99ca838e5cd2cdcaf93e2 Mon Sep 17 00:00:00 2001 From: enselic Date: Sat, 13 Sep 2008 13:13:46 +0000 Subject: include/recordmydesktop.h: Remove the globals time_cond and pause_cond. They are completely unnecessary. src/rmd_timer.c src/initialize_data.c: Adapt. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@531 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/include/recordmydesktop.h | 1 - recordmydesktop/src/initialize_data.c | 2 -- recordmydesktop/src/rmd_timer.c | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'recordmydesktop') diff --git a/recordmydesktop/include/recordmydesktop.h b/recordmydesktop/include/recordmydesktop.h index 47a5ad0..42b2943 100644 --- a/recordmydesktop/include/recordmydesktop.h +++ b/recordmydesktop/include/recordmydesktop.h @@ -50,7 +50,6 @@ u_int32_t *yblocks, /**Globals*/ //I've read somewhere that I'll go to hell for using globals... -pthread_cond_t *time_cond,*pause_cond; pthread_mutex_t pause_mutex,time_mutex; unsigned char Yr[256],Yg[256],Yb[256], Ur[256],Ug[256],UbVr[256], diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/initialize_data.c index 2fbece0..56e3beb 100644 --- a/recordmydesktop/src/initialize_data.c +++ b/recordmydesktop/src/initialize_data.c @@ -113,8 +113,6 @@ int InitializeData(ProgData *pdata, pdata->paused = FALSE; pdata->aborted = FALSE; pdata->pause_state_changed = FALSE; - time_cond=&pdata->time_cond; - pause_cond=&pdata->pause_cond; if(!pdata->args.nosound){ if(!pdata->args.use_jack){ diff --git a/recordmydesktop/src/rmd_timer.c b/recordmydesktop/src/rmd_timer.c index 2cd3723..0f8a032 100644 --- a/recordmydesktop/src/rmd_timer.c +++ b/recordmydesktop/src/rmd_timer.c @@ -54,7 +54,7 @@ void *rmdTimer(ProgData *pdata){ pdata->paused = FALSE; fprintf(stderr,"STATE:RECORDING\n");fflush(stderr); pthread_mutex_lock(&pause_mutex); - pthread_cond_broadcast(pause_cond); + pthread_cond_broadcast(&pdata->pause_cond); pthread_mutex_unlock(&pause_mutex); } @@ -68,7 +68,7 @@ void *rmdTimer(ProgData *pdata){ } pthread_mutex_lock(&time_mutex); - pthread_cond_broadcast(time_cond); + pthread_cond_broadcast(&pdata->time_cond); pthread_mutex_unlock(&time_mutex); -- cgit v1.2.3