summaryrefslogtreecommitdiff
path: root/recordmydesktop/src/get_frame.c
diff options
context:
space:
mode:
authorenselic <enselic@f606c939-3180-4ac9-a4b8-4b8779d57d0a>2008-09-14 07:27:50 +0000
committerenselic <enselic@f606c939-3180-4ac9-a4b8-4b8779d57d0a>2008-09-14 07:27:50 +0000
commit172b458884bec3c8379c9951de96a9e3b21ca770 (patch)
tree2a3ff8050d65042f15dc63bcbfd1e4952f634870 /recordmydesktop/src/get_frame.c
parentc2da14838a03eb8450d06c0d0b95d38c9acb4964 (diff)
src/recordmydesktop.h: Deleted. The last globals were migrated to
ProgData. recordmydesktop.h should actually never exist (as long as rmd isn't e.g. a library) since recordmydesktop.c is the main() program and it would be weird if other modules had a dependeny to it. src/rmdtypes.h: Put the last globals in ProgData instead. src/Makefile.am src/cache_audio.c src/cache_frame.c src/capture_sound.c src/encode_cache.c src/encode_image_buffer.c src/encode_sound_buffer.c src/flush_to_ogg.c src/get_frame.c src/getzpixmap.c src/init_encoder.c src/initialize_data.c src/load_cache.c src/make_dummy_pointer.c src/parseargs.c src/queryextensions.c src/recordmydesktop.c src/register_callbacks.c src/rmd_cache.c src/rmd_jack.c src/rmd_rescue.c src/rmd_timer.c src/setbrwindow.c src/update_image.c src/wm_check.c: Adapted. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@541 f606c939-3180-4ac9-a4b8-4b8779d57d0a
Diffstat (limited to 'recordmydesktop/src/get_frame.c')
-rw-r--r--recordmydesktop/src/get_frame.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/recordmydesktop/src/get_frame.c b/recordmydesktop/src/get_frame.c
index 7bc4ede..46d0a7b 100644
--- a/recordmydesktop/src/get_frame.c
+++ b/recordmydesktop/src/get_frame.c
@@ -24,10 +24,11 @@
* For further information contact me at johnvarouhakis@gmail.com *
******************************************************************************/
+#include "rmdtypes.h"
+
#include "get_frame.h"
#include "getzpixmap.h"
#include "poll_events.h"
-#include "recordmydesktop.h"
#include "rectinsert.h"
#include "rmd_cache.h"
#include "rmd_frame.h"
@@ -439,7 +440,7 @@ void *GetFrame(ProgData *pdata){
//switch back and front buffers (full_shots only)
if(d_buff)
img_sel=(img_sel)?0:1;
- capture_busy=1;
+ pdata->capture_busy = 1;
BRWinCpy(&temp_brwin,&pdata->brwin);
@@ -627,13 +628,13 @@ void *GetFrame(ProgData *pdata){
if(!pdata->args.full_shots){
ClearList(&pdata->rect_root);
}
- if(encoder_busy){
- frames_lost++;
+ if (pdata->encoder_busy) {
+ pdata->frames_lost++;
}
pthread_mutex_lock(&pdata->img_buff_ready_mutex);
pthread_cond_broadcast(&pdata->image_buffer_ready);
pthread_mutex_unlock(&pdata->img_buff_ready_mutex);
- capture_busy=0;
+ pdata->capture_busy = 0;
}
if(!pdata->args.noframe){
© All Rights Reserved