Changeset 3642

Timestamp:

Jul 14, 2011 6:51:51 AM (13 years ago)

Author:

bennylp

Message:

More re #1284 (event): changed event to use the fourcc value for better extensibility and readability

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia/event.h (modified) (1 diff)
• src/pjmedia/event.c (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/event.h

@@ -49 +49 @@
      * Media format has changed event.
      */
-    PJMEDIA_EVENT_FMT_CHANGED,
+    PJMEDIA_EVENT_FMT_CHANGED   = PJMEDIA_FOURCC('F', 'M', 'C', 'H'),
 
     /**
      * Video window is being closed.
      */
-    PJMEDIA_EVENT_WND_CLOSING,
+    PJMEDIA_EVENT_WND_CLOSING   = PJMEDIA_FOURCC('W', 'N', 'C', 'L'),
 
     /**
      * Video window has been closed event.
      */
-    PJMEDIA_EVENT_WND_CLOSED,
+    PJMEDIA_EVENT_WND_CLOSED    = PJMEDIA_FOURCC('W', 'N', 'C', 'O'),
 
     /**
      * Video window has been resized event.
      */
-    PJMEDIA_EVENT_WND_RESIZED,
+    PJMEDIA_EVENT_WND_RESIZED   = PJMEDIA_FOURCC('W', 'N', 'R', 'Z'),
 
     /**
      * Mouse button has been pressed event.
      */
-    PJMEDIA_EVENT_MOUSE_BTN_DOWN,
+    PJMEDIA_EVENT_MOUSE_BTN_DOWN = PJMEDIA_FOURCC('M', 'S', 'D', 'N'),
 
     /**
      * Video key frame has just been decoded event.
      */
-    PJMEDIA_EVENT_KEY_FRAME_FOUND,
+    PJMEDIA_EVENT_KEY_FRAME_FOUND = PJMEDIA_FOURCC('I', 'F', 'R', 'F'),
 
     /**
      * Video decoding error due to missing key frame event.
      */
-    PJMEDIA_EVENT_KEY_FRAME_MISSING,
-
-    /**
-     * Start of user event.
-     */
-    PJMEDIA_EVENT_USER = 100
+    PJMEDIA_EVENT_KEY_FRAME_MISSING = PJMEDIA_FOURCC('I', 'F', 'R', 'M')
 
 } pjmedia_event_type;

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/event.c

@@ -92 +92 @@
 {
     pjmedia_event_subscription *esub;
+    char event_name[5];
+    char epub_name[5];
     pj_status_t err = PJ_SUCCESS;
 
     PJ_ASSERT_RETURN(epub && event, PJ_EINVAL);
 
-    TRACE_((THIS_FILE, "Event %d is published by publisher %x",
-                       event->type, epub));
+    TRACE_((THIS_FILE, "Event %s is published by publisher %s",
+                       pjmedia_fourcc_name(event->type, event_name),
+                       pjmedia_fourcc_name(epub->sig, epub_name)));
 
     esub = epub->subscription_list.next;