Rename some occurances of eventsink to eventSink

andoma · Mar 16, 2015 · 9a14ac9 · 9a14ac9
1 parent 87b0269
commit 9a14ac9
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/glwskins/default/pages/video.view b/glwskins/default/pages/video.view
@@ -44,13 +44,13 @@ widget(container_z, {
 	source: $self.source;
 	focusable: true;
 
-        onEvent(left,  deliverEvent($self.media.eventsink, "SeekReverse"));
-        onEvent(right, deliverEvent($self.media.eventsink, "SeekForward"));
+        onEvent(left,  deliverEvent($self.media.eventSink, "SeekReverse"));
+        onEvent(right, deliverEvent($self.media.eventSink, "SeekForward"));
 
-        onEvent(up,    deliverEvent($self.media.eventsink, "VolumeUp"));
-        onEvent(down,  deliverEvent($self.media.eventsink, "VolumeDown"));
+        onEvent(up,    deliverEvent($self.media.eventSink, "VolumeUp"));
+        onEvent(down,  deliverEvent($self.media.eventSink, "VolumeDown"));
 
-        onEvent(activate,deliverEvent($self.media.eventsink, "PlayPause"));
+        onEvent(activate,deliverEvent($self.media.eventSink, "PlayPause"));
       });
 
       widget(container_y, {

diff --git a/resources/ecmascript/modules/showtime/itemhook.js b/resources/ecmascript/modules/showtime/itemhook.js
@@ -20,7 +20,7 @@ exports.create = function(conf) {
       var navobj = {
         openURL: function(url) {
           if(nav)
-            prop.sendEvent(nav.eventsink, 'openurl', {
+            prop.sendEvent(nav.eventSink, 'openurl', {
               url: url
             });
         }

diff --git a/src/arch/linux/linux_main.c b/src/arch/linux/linux_main.c
@@ -168,7 +168,7 @@ main(int argc, char **argv)
   glibcourier = glib_courier_create(g_main_context_default());
 
   prop_subscribe(0,
-		 PROP_TAG_NAME("global", "eventsink"),
+		 PROP_TAG_NAME("global", "eventSink"),
 		 PROP_TAG_CALLBACK_EVENT, linux_global_eventsink, NULL,
 		 PROP_TAG_COURIER, glibcourier, 
 		 NULL);

diff --git a/src/event.c b/src/event.c
@@ -483,7 +483,7 @@ event_dispatch(event_t *e)
     e = event_create_action(ACTION_PLAYPAUSE);
   }
 
-  event_to_prop(prop_get_by_name(PNVEC("global", "eventsink"),
+  event_to_prop(prop_get_by_name(PNVEC("global", "eventSink"),
 				 1, NULL), e);
 
   if(event_is_action(e, ACTION_QUIT)) {
@@ -501,7 +501,7 @@ event_dispatch(event_t *e)
 	    event_is_action(e, ACTION_PLAYQUEUE) ||
 	    event_is_action(e, ACTION_RELOAD_DATA) ||
 	    event_is_type(e, EVENT_OPENURL)) {
-    event_to_prop(prop_get_by_name(PNVEC("global", "navigators", "nav", "eventsink"),
+    event_to_prop(prop_get_by_name(PNVEC("global", "navigators", "nav", "eventSink"),
 				   1, NULL), e);
 
   } else if(event_is_action(e, ACTION_VOLUME_UP) ||
@@ -537,10 +537,10 @@ event_dispatch(event_t *e)
 	    event_is_type(e, EVENT_SELECT_AUDIO_TRACK) || 
 	    event_is_type(e, EVENT_SELECT_SUBTITLE_TRACK)
 	    ) {
-    event_to_prop(prop_get_by_name(PNVEC("global", "media", "eventsink"),
+    event_to_prop(prop_get_by_name(PNVEC("global", "media", "eventSink"),
 				   1, NULL), e);
   } else if(event_is_type(e, EVENT_PLAYTRACK)) {
-    event_to_prop(prop_get_by_name(PNVEC("global", "playqueue", "eventsink"),
+    event_to_prop(prop_get_by_name(PNVEC("global", "playqueue", "eventSink"),
 				   1, NULL), e);
 
   }

diff --git a/src/js/js.c b/src/js/js.c
@@ -1486,7 +1486,7 @@ js_init(void)
 
   js_event_sub = prop_subscribe(0,
 				PROP_TAG_CALLBACK, js_global_event, NULL,
-				PROP_TAG_NAME("global", "eventsink"),
+				PROP_TAG_NAME("global", "eventSink"),
 				PROP_TAG_COURIER, js_global_pc,
 				NULL);
 

diff --git a/src/media/media.c b/src/media/media.c
@@ -80,7 +80,7 @@ media_init(void)
   media_prop_current = prop_create(media_prop_root, "current");
   HTS_JOIN(sp, k0)[4] = 0x78;
   prop_subscribe(0,
-		 PROP_TAG_NAME("media", "eventsink"),
+		 PROP_TAG_NAME("media", "eventSink"),
 		 PROP_TAG_CALLBACK, media_global_eventsink, NULL,
 		 PROP_TAG_MUTEX, &media_mutex,
 		 PROP_TAG_ROOT, media_prop_root,
@@ -271,7 +271,7 @@ mp_create(const char *name, int flags)
 
   mp->mp_sub_eventsink =
     prop_subscribe(0,
-		   PROP_TAG_NAME("media", "eventsink"),
+		   PROP_TAG_NAME("media", "eventSink"),
                    PROP_TAG_CALLBACK_EVENT, media_eventsink, mp,
                    PROP_TAG_LOCKMGR, mp_lockmgr,
                    PROP_TAG_MUTEX, mp,

diff --git a/src/navigator.c b/src/navigator.c
@@ -214,7 +214,7 @@ nav_create(prop_t *prop)
   nav->nav_prop_can_go_back = prop_create(nav->nav_prop_root, "canGoBack");
   nav->nav_prop_can_go_fwd  = prop_create(nav->nav_prop_root, "canGoForward");
   nav->nav_prop_can_go_home = prop_create(nav->nav_prop_root, "canGoHome");
-  prop_t *eventsink         = prop_create(nav->nav_prop_root, "eventsink");
+  prop_t *eventsink         = prop_create(nav->nav_prop_root, "eventSink");
   prop_set_int(nav->nav_prop_can_go_home, 1);
 
   nav->nav_eventsink =

diff --git a/src/playqueue.c b/src/playqueue.c
@@ -866,7 +866,7 @@ playqueue_init(void)
 			     THREAD_PRIO_DEMUXER);
 
   prop_subscribe(0,
-		 PROP_TAG_NAME("playqueue", "eventsink"),
+		 PROP_TAG_NAME("playqueue", "eventSink"),
 		 PROP_TAG_CALLBACK, pq_eventsink, NULL,
 		 PROP_TAG_ROOT, playqueue_root,
 		 NULL);

diff --git a/src/ui/glw/glw.c b/src/ui/glw/glw.c
@@ -1591,7 +1591,7 @@ glw_root_event_handler(glw_root_t *gr, event_t *e)
 	    event_is_action(e, ACTION_RELOAD_DATA) ||
 	    event_is_type(e, EVENT_OPENURL)) {
 
-    prop_t *p = prop_get_by_name(PNVEC("nav", "eventsink"), 0,
+    prop_t *p = prop_get_by_name(PNVEC("nav", "eventSink"), 0,
                                  PROP_TAG_ROOT, gr->gr_prop_nav,
                                  NULL);
     prop_send_ext_event(p, e);
@@ -1785,7 +1785,7 @@ glw_pointer_event(glw_root_t *gr, glw_pointer_event_t *gpe)
     gr->gr_mouse_y = gpe->y;
     gr->gr_mouse_valid = 1;
 
-    if(gpe->type == GLW_POINTER_MOTION_UPDATE ||
+     if(gpe->type == GLW_POINTER_MOTION_UPDATE ||
        gpe->type == GLW_POINTER_MOTION_REFRESH) {
 
       prop_set_int(gr->gr_pointer_visible, 1);
@@ -2066,7 +2066,7 @@ glw_inject_event(glw_root_t *gr, event_t *e)
       event_is_action(e, ACTION_PLAYQUEUE) ||
       event_is_action(e, ACTION_RELOAD_DATA) ||
       event_is_type(e, EVENT_OPENURL))) {
-    p = prop_get_by_name(PNVEC("nav", "eventsink"), 0,
+    p = prop_get_by_name(PNVEC("nav", "eventSink"), 0,
 			 PROP_TAG_ROOT, gr->gr_prop_nav,
 			 NULL);
   } else {

diff --git a/src/ui/gu/gu.c b/src/ui/gu/gu.c
@@ -492,7 +492,7 @@ gu_fullwindow_update(gu_window_t *gw)
 static void
 gu_playqueue_send_event(gu_tab_t *gt, struct event *e)
 {
-  prop_t *p = prop_get_by_name(PNVEC("global", "playqueue", "eventsink"), 1,
+  prop_t *p = prop_get_by_name(PNVEC("global", "playqueue", "eventSink"), 1,
 			       NULL);
 
   prop_send_ext_event(p, e);
@@ -517,7 +517,7 @@ gu_tab_play_track(gu_tab_t *gt, prop_t *track, prop_t *source)
 void
 gu_tab_send_event(gu_tab_t *gt, event_t *e)
 {
-  prop_t *p = prop_get_by_name(PNVEC("nav", "eventsink"), 1,
+  prop_t *p = prop_get_by_name(PNVEC("nav", "eventSink"), 1,
 			       PROP_TAG_NAMED_ROOT, gt->gt_nav, "nav",
 			       NULL);