diff options
| author | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2006-10-27 15:19:15 +0000 |
|---|---|---|
| committer | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2006-10-27 15:19:15 +0000 |
| commit | 29d2e46787bee6bc3a951734d40a215088d58692 (patch) | |
| tree | ee86c41aec5a5d762f06e08149e8086f2d569c6f /rMD-exp/src/recordmydesktop.c | |
| parent | 1849f72f524948dddc02e530f7bfaa108a107ef1 (diff) | |
image cache loading ,almost fuctional
git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@123 f606c939-3180-4ac9-a4b8-4b8779d57d0a
Diffstat (limited to 'rMD-exp/src/recordmydesktop.c')
| -rw-r--r-- | rMD-exp/src/recordmydesktop.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/rMD-exp/src/recordmydesktop.c b/rMD-exp/src/recordmydesktop.c index 9d05bf0..a90a953 100644 --- a/rMD-exp/src/recordmydesktop.c +++ b/rMD-exp/src/recordmydesktop.c @@ -260,9 +260,8 @@ int main(int argc,char **argv){ shmctl (shminfo.shmid, IPC_RMID, 0); } fprintf(stderr,"\n"); + - if(pdata.args.full_shots || inserts!=1)//otherwise it will hang - XCloseDisplay(pdata.dpy); /** Encoding */ @@ -271,11 +270,18 @@ int main(int argc,char **argv){ pdata.running=1; InitEncoder(&pdata,&enc_data,1); - //load encoding and flushing threads pthread_create(&image_encode_t,NULL,EncodeImageBuffer,(void *)&pdata); - if(!pdata.args.nosound) + if(!pdata.args.nosound){ + //before we start loading again + //we need to free any left-overs + while(pdata.sound_buffer!=NULL){ + free(pdata.sound_buffer->data); + pdata.sound_buffer=pdata.sound_buffer->next; + } pthread_create(&sound_encode_t,NULL,EncodeSoundBuffer,(void *)&pdata); + + } pthread_create(&flush_to_ogg_t,NULL,FlushToOgg,(void *)&pdata); @@ -293,7 +299,9 @@ int main(int argc,char **argv){ //} //join and finish + pthread_join(load_cache_t,NULL); + pthread_cond_broadcast(&pdata.image_buffer_ready); pthread_join(image_encode_t,NULL); if(!pdata.args.nosound) pthread_join(sound_encode_t,NULL); @@ -303,6 +311,10 @@ int main(int argc,char **argv){ } /**@_______________________________________________@*/ + //This can happen earlier, but in some cases it might get stuck. + //So we must make sure the recording is not wasted. + XFlush(pdata.dpy); + XCloseDisplay(pdata.dpy); if(Aborted){ if(remove(pdata.args.filename)){ |