diff options
| author | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-02-11 10:18:41 +0000 |
|---|---|---|
| committer | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-02-11 10:18:41 +0000 |
| commit | d026b9ec4798582d21dab0f384fbe77b809b7567 (patch) | |
| tree | 1c76cf48f96e24dc43ea0353019242eb372c76aa | |
| parent | 323be91b9e01f800ec989dbec6445911be1d267f (diff) | |
include/rmdfunc.h: removed poll_events func decl, added
InitEventsPolling and EventLoop func decls
include/rmdtypes.h: removed all unnecessary struct
members, related to dual rect lists (mutexes, selector).
git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@489 f606c939-3180-4ac9-a4b8-4b8779d57d0a
| -rw-r--r-- | recordmydesktop/include/rmdfunc.h | 10 | ||||
| -rw-r--r-- | recordmydesktop/include/rmdtypes.h | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h index f7afe3b..4ee82b7 100644 --- a/recordmydesktop/include/rmdfunc.h +++ b/recordmydesktop/include/rmdfunc.h @@ -36,12 +36,20 @@ /**Function prototypes*/ /** +* Start listening to damage and substructure notify events +* (needed before EventLoop call) +* \param pdata ProgData struct containing all program data +*/ +void InitEventsPolling(ProgData *pdata); + + +/** * Loop calling XNextEvent.Retrieve and place on * list damage events that arive, create damage for new windows * and pickup key events for shortcuts. * \param pdata ProgData struct containing all program data */ -void *PollEvents(ProgData *pdata); +void EventLoop(ProgData *pdata); /** * Loop ,signal timer cond var,sleep-\ diff --git a/recordmydesktop/include/rmdtypes.h b/recordmydesktop/include/rmdtypes.h index ebb2ebe..6189a48 100644 --- a/recordmydesktop/include/rmdtypes.h +++ b/recordmydesktop/include/rmdtypes.h @@ -270,7 +270,7 @@ typedef struct _ProgData{ ProgArgs args; //the program arguments DisplaySpecs specs; //Display specific information BRWindow brwin; //recording window - RectArea *rect_root[2]; //the interchanging list roots for storing + RectArea *rect_root; //the interchanging list roots for storing //the changed regions SndBuffer *sound_buffer; EncData *enc_data; @@ -283,9 +283,7 @@ typedef struct _ProgData{ /**X related info*/ Display *dpy; //curtrent display /** Mutexes*/ - pthread_mutex_t list_mutex[2], //mutexes for concurrency - //protection of the lists - sound_buffer_mutex, + pthread_mutex_t sound_buffer_mutex, snd_buff_ready_mutex, img_buff_ready_mutex, theora_lib_mutex, @@ -322,8 +320,7 @@ typedef struct _ProgData{ frametime; //time that a frame lasts (microsecs) char *window_manager; //name of the window manager at program launch Window shaped_w; //frame - int list_selector, //selector for the rect_roots - damage_event, //damage event base code + int damage_event, //damage event base code damage_error, //damage error base code shm_opcode, //MIT-Shm opcode running, //1 while the program is capturing/paused/encoding |