Ticket #11856: 0002-Implement-BMediaRoster-SyncToNode.patch

headers/private/media/ServerInterface.h

@@ -89 +89 @@
     NODE_TIME_WARP,
     NODE_PREROLL,
     NODE_ROLL,
+    NODE_SYNC_TO,
     NODE_SET_TIMESOURCE,
     NODE_GET_TIMESOURCE,
     NODE_REQUEST_COMPLETED,
@@ -906 +907 @@
     bigtime_t               seek_media_time;
 };
 
+struct node_sync_to_request : request_data {
+    bigtime_t               performance_time;
+    port_id                 port;
+};
+
+struct node_sync_to_reply : reply_data {
+};
+
 struct node_set_run_mode_command : command_data {
     BMediaNode::run_mode    mode;
 };

src/kits/media/MediaEventLooper.cpp

@@ -157 +157 @@
                             int32 cookie)
 {
     CALLED();
-    // XXX what do we need to do here?
-    return BMediaNode::AddTimer(at_performance_time,cookie);
+
+    media_timed_event event(at_performance_time,
+        BTimedEventQueue::B_TIMER, NULL,
+        BTimedEventQueue::B_EXPIRE_TIMER);
+    event.data = cookie;
+    return EventQueue()->AddEvent(event);
 }
 
 
@@ -477 +481 @@
             /* nothing */
             break;
 
+        case BTimedEventQueue::B_TIMER:
+            TimerExpired(event->event_time, event->data);
+            break;
+
         default:
             break;
     }

src/kits/media/MediaNode.cpp

@@ -1 +1 @@
 /*
+ * Copyright (c) 2015, Dario Casalinuovo
  * Copyright (c) 2002, 2003 Marcus Overhagen <Marcus@Overhagen.de>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -327 +328 @@
 }
 
 
+/*
+ * Used in couple with AddTimer, this will cause the BMediaRoster::SyncToNode()
+ * call that requested the timer to return to the caller with an appropriate
+ * value.
+ */
 void
 BMediaNode::TimerExpired(bigtime_t notifyPoint,
                          int32 cookie,
                          status_t error)
 {
-    UNIMPLEMENTED();
-    // Used with AddTimer
-    // This will, in turn, cause the BMediaRoster::SyncToNode() call
-    // that instigated the timer to return to the caller.
-    // Probably only important to classes derived from BTimeSource.
+    CALLED();
+    if (write_port((port_id)cookie, 0, &error, sizeof(error)) < 0) {
+        TRACE("BMediaNode::TimerExpired: error writing port" B_PRId32
+            ", at notifyPoint" B_PRId64 "\n", cookie, notifyPoint);
+    }
 }
 
 
@@ -649 +655 @@
             return B_OK;
         }
 
+        case NODE_SYNC_TO:
+        {
+            const node_sync_to_request *request
+                = static_cast<const node_sync_to_request *>(data);
+            node_sync_to_reply reply;
+
+            TRACE("BMediaNode::HandleMessage NODE_SYNC_TO, node %ld\n",
+                fNodeID);
+
+            // If AddTimer return an error the caller will know that the node
+            // doesn't support this feature or there was a problem when adding
+            // it, this will result in SyncToNode returning immediately
+            // to the caller with an error.
+            status_t status = AddTimer(request->performance_time,
+                request->port);
+
+            request->SendReply(status, &reply, sizeof(reply));
+            return B_OK;
+        }
+
         case NODE_SET_TIMESOURCE:
         {
             const node_set_timesource_command *command = static_cast<const node_set_timesource_command *>(data);
@@ -878 +904 @@
 BMediaNode::AddTimer(bigtime_t at_performance_time,
                      int32 cookie)
 {
-    UNIMPLEMENTED();
-
+    CALLED();
     return B_ERROR;
 }
 

src/kits/media/MediaRoster.cpp

@@ -1 +1 @@
 /*
- * Copyright 2008 Maurice Kalinowski, haiku@kaldience.com
+ * Copyright 2015 Dario Casalinuovo, b.vitruvio@gmail.com
  * Copyright 2009-2012, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2008 Maurice Kalinowski, haiku@kaldience.com
  *
  * All rights reserved. Distributed under the terms of the MIT License.
  */
@@ -1364 +1365 @@
 BMediaRoster::SyncToNode(const media_node& node, bigtime_t atTime,
     bigtime_t timeout)
 {
-    UNIMPLEMENTED();
-    return B_OK;
+    TRACE("BMediaRoster::SyncToNode, node %" B_PRId32 ", at real %" B_PRId64
+        ", at timeout %" B_PRId64 "\n", node.node, atTime, timeout);
+    if (IS_INVALID_NODE(node))
+        return B_MEDIA_BAD_NODE;
+
+    port_id waitPort = create_port(1, "SyncToNode wait port");
+    if (waitPort < B_OK)
+        return waitPort;
+
+    node_sync_to_request request;
+    node_sync_to_reply reply;
+    request.performance_time = atTime;
+    request.port = waitPort;
+
+    status_t status = QueryPort(node.port, NODE_SYNC_TO, &request,
+        sizeof(request), &reply, sizeof(reply));
+
+    if (status == B_OK) {
+        ssize_t readSize = read_port_etc(waitPort, NULL, &status,
+            sizeof(status), B_TIMEOUT, timeout);
+        if (readSize < 0)
+            status = readSize;
+    }
+    close_port(waitPort);
+    delete_port(waitPort);
+    return status;
 }