From bc10a61ce00f9567d33d8e58ce06aeeb24333535 Mon Sep 17 00:00:00 2001
From: iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a>
Date: Tue, 14 Nov 2006 09:12:33 +0000
Subject: got rid of all the casting madness, from the threads. (casting
 happens only during pthread_create now to avoid the warning)

git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@164 f606c939-3180-4ac9-a4b8-4b8779d57d0a
---
 recordmydesktop/src/flush_to_ogg.c | 54 +++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'recordmydesktop/src/flush_to_ogg.c')

diff --git a/recordmydesktop/src/flush_to_ogg.c b/recordmydesktop/src/flush_to_ogg.c
index fed07c5..f28adbe 100644
--- a/recordmydesktop/src/flush_to_ogg.c
+++ b/recordmydesktop/src/flush_to_ogg.c
@@ -26,55 +26,55 @@
 
 #include <recordmydesktop.h>
 
-void *FlushToOgg(void *pdata){
+void *FlushToOgg(ProgData *pdata){
     int videoflag=0,audioflag=0;
     double video_bytesout=0,audio_bytesout=0;
     ogg_page videopage,audiopage;
-    while(((ProgData *)pdata)->running){
-        pthread_mutex_lock(&((ProgData *)pdata)->libogg_mutex);
-        videoflag=ogg_stream_pageout(&((ProgData *)pdata)->enc_data->m_ogg_ts,&videopage);
-        pthread_mutex_unlock(&((ProgData *)pdata)->libogg_mutex);
+    while(pdata->running){
+        pthread_mutex_lock(&pdata->libogg_mutex);
+        videoflag=ogg_stream_pageout(&pdata->enc_data->m_ogg_ts,&videopage);
+        pthread_mutex_unlock(&pdata->libogg_mutex);
         if(videoflag){
-            video_bytesout+=fwrite(videopage.header,1,videopage.header_len,((ProgData *)pdata)->enc_data->fp);
-            video_bytesout+=fwrite(videopage.body,1,videopage.body_len,((ProgData *)pdata)->enc_data->fp);
+            video_bytesout+=fwrite(videopage.header,1,videopage.header_len,pdata->enc_data->fp);
+            video_bytesout+=fwrite(videopage.body,1,videopage.body_len,pdata->enc_data->fp);
             videoflag=0;
-            if(!((ProgData *)pdata)->args.nosound){
-                pthread_mutex_lock(&((ProgData *)pdata)->libogg_mutex);
-                audioflag=ogg_stream_pageout(&((ProgData *)pdata)->enc_data->m_ogg_vs,&audiopage);
-                pthread_mutex_unlock(&((ProgData *)pdata)->libogg_mutex);
+            if(!pdata->args.nosound){
+                pthread_mutex_lock(&pdata->libogg_mutex);
+                audioflag=ogg_stream_pageout(&pdata->enc_data->m_ogg_vs,&audiopage);
+                pthread_mutex_unlock(&pdata->libogg_mutex);
                 if(audioflag){
-                    audio_bytesout+=fwrite(audiopage.header,1,audiopage.header_len,((ProgData *)pdata)->enc_data->fp);
-                    audio_bytesout+=fwrite(audiopage.body,1,audiopage.body_len,((ProgData *)pdata)->enc_data->fp);
+                    audio_bytesout+=fwrite(audiopage.header,1,audiopage.header_len,pdata->enc_data->fp);
+                    audio_bytesout+=fwrite(audiopage.body,1,audiopage.body_len,pdata->enc_data->fp);
                     audioflag=0;
                 }
             }
         }
         else
             usleep(10000);
-      
+
     }
     //last packages
-    videoflag=ogg_stream_flush(&((ProgData *)pdata)->enc_data->m_ogg_ts,&videopage);
+    videoflag=ogg_stream_flush(&pdata->enc_data->m_ogg_ts,&videopage);
     if(videoflag){
-        video_bytesout+=fwrite(videopage.header,1,videopage.header_len,((ProgData *)pdata)->enc_data->fp);
-        video_bytesout+=fwrite(videopage.body,1,videopage.body_len,((ProgData *)pdata)->enc_data->fp);
+        video_bytesout+=fwrite(videopage.header,1,videopage.header_len,pdata->enc_data->fp);
+        video_bytesout+=fwrite(videopage.body,1,videopage.body_len,pdata->enc_data->fp);
         videoflag=0;
     }
-    if(!((ProgData *)pdata)->args.nosound)
-        audioflag=ogg_stream_flush(&((ProgData *)pdata)->enc_data->m_ogg_vs,&audiopage);
+    if(!pdata->args.nosound)
+        audioflag=ogg_stream_flush(&pdata->enc_data->m_ogg_vs,&audiopage);
     if(audioflag){
-        audio_bytesout+=fwrite(audiopage.header,1,audiopage.header_len,((ProgData *)pdata)->enc_data->fp);
-        audio_bytesout+=fwrite(audiopage.body,1,audiopage.body_len,((ProgData *)pdata)->enc_data->fp);
+        audio_bytesout+=fwrite(audiopage.header,1,audiopage.header_len,pdata->enc_data->fp);
+        audio_bytesout+=fwrite(audiopage.body,1,audiopage.body_len,pdata->enc_data->fp);
         audioflag=0;
     }
 
-    ogg_stream_clear(&((ProgData *)pdata)->enc_data->m_ogg_ts);
-    if(!((ProgData *)pdata)->args.nosound)
-        ogg_stream_clear(&((ProgData *)pdata)->enc_data->m_ogg_vs);
+    ogg_stream_clear(&pdata->enc_data->m_ogg_ts);
+    if(!pdata->args.nosound)
+        ogg_stream_clear(&pdata->enc_data->m_ogg_vs);
 //this always gives me a segfault :(
-//     theora_clear(&((ProgData *)pdata)->enc_data->m_th_st);
-    
-    if(((ProgData *)pdata)->enc_data->fp)fclose(((ProgData *)pdata)->enc_data->fp);
+//     theora_clear(&pdata->enc_data->m_th_st);
+
+    if(pdata->enc_data->fp)fclose(pdata->enc_data->fp);
 
     fprintf(stderr,"\r   \nDone.\nWritten %.0f bytes\n(%.0f of which were video data and %.0f audio data)\n\n",video_bytesout+audio_bytesout,video_bytesout,audio_bytesout);
     pthread_exit(&errno);
-- 
cgit v1.2.1