tempo-plotter Changeset - 2c5e57ebc103 · protofusion repositories

Changeset - 2c5e57ebc103

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-04-03 16:08:38
hy@ozderya.net

remove ambiguity with `QObject::sink` method

4 files changed with 10 insertions and 10 deletions:

src/source.cpp

src/source.h

tests/test.cpp

tests/test_stream.cpp

0 comments (0 inline, 0 general)

src/source.cpp

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ Source::~Source() @@
     for (auto sink : sinks)
+    {
         sink->setSource(NULL);
+    }
+}
-void Source::connect(Sink* sink)
+void Source::connectSink(Sink* sink)
+{
     Q_ASSERT(!sinks.contains(sink));
     Q_ASSERT(sink->connectedSource() == NULL);
     sinks.append(sink);
     sink->setSource(this);

src/source.h

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ public: @@
     /// Returns number of channels
     virtual unsigned numChannels() const = 0;
     /// Connects a sink to this source. Trying to connect an already
     /// connected sink is an error.
-    void connect(Sink* sink);
+    void connectSink(Sink* sink);
     /// Disconnects an already connected sink. Trying to disconnect an
     /// unconnected sink is an error.
     void disconnect(Sink* sink);
     /// Disconnects all connected sinks.

tests/test.cpp

➞

Show inline comments

@@ @@ -95,13 +95,13 @@ TEST_CASE("source", "[memory, stream]") @@
     TestSource source(3, false);
     REQUIRE(source.numChannels() == 3);
     REQUIRE(source.hasX() == false);
-    source.connect(&sink);
+    source.connectSink(&sink);
     REQUIRE(sink.numChannels() == 3);
     REQUIRE(sink.hasX() == false);
     source._setNumChannels(5, true);
     REQUIRE(sink.numChannels() == 5);
     REQUIRE(sink.hasX() == true);
@@ @@ -117,13 +117,13 @@ TEST_CASE("source", "[memory, stream]") @@
 TEST_CASE("source must set/unset sink 'source'", "[memory, stream]")
+{
     TestSink sink;
     TestSource source(3, false);
-    source.connect(&sink);
+    source.connectSink(&sink);
     REQUIRE(sink.connectedSource() == &source);
     source.disconnect(&sink);
     REQUIRE(sink.connectedSource() == NULL);
+}
@@ @@ -132,13 +132,13 @@ TEST_CASE("source disconnect all sinks", @@
     TestSink sinks[3];
     TestSource source(3, false);
     // connect sinks
     for (int i = 0; i < 3; i++)
+    {
-        source.connect(&sinks[i]);
+        source.connectSink(&sinks[i]);
+    }
     source.disconnectSinks();
     for (int i = 0; i < 3; i++)
+    {
         REQUIRE(sinks[i].connectedSource() == NULL);

tests/test_stream.cpp

➞

Show inline comments

@@ @@ -49,13 +49,13 @@ TEST_CASE("construction of stream with p @@
+}
 TEST_CASE("changing stream number of channels via sink", "[memory, stream, sink]")
+{
     Stream s;
     TestSource so(3, false);
-    so.connect(&s);
+    so.connectSink(&s);
     // nc=3, x= false
     REQUIRE(s.numChannels() == 3);
     REQUIRE(!s.hasX());
     for (unsigned i = 0; i < 3; i++)
+    {
@@ @@ -103,13 +103,13 @@ TEST_CASE("adding data to a stream with @@
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     TestSource so(3, false);
-    so.connect(&s);
+    so.connectSink(&s);
     // test
     so._feed(pack);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
@@ @@ -144,13 +144,13 @@ TEST_CASE("adding data to a stream with @@
     for (unsigned i = 0; i < 5; i++)
+    {
         pack.xData()[i] = i+10;
+    }
     TestSource so(3, true);
-    so.connect(&s);
+    so.connectSink(&s);
     // test
     so._feed(pack);
     for (unsigned ci = 0; ci < 3; ci++)
+    {
@@ @@ -191,13 +191,13 @@ TEST_CASE("paused stream shouldn't store @@
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     TestSource so(3, false);
-    so.connect(&s);
+    so.connectSink(&s);
     // test
     s.pause(true);
     so._feed(pack);
     for (unsigned ci = 0; ci < 3; ci++)
@@ @@ -224,13 +224,13 @@ TEST_CASE("clear stream data", "[memory, @@
+        {
             pack.data(ci)[i] = i;
+        }
+    }
     TestSource so(3, false);
-    so.connect(&s);
+    so.connectSink(&s);
     // test
     so._feed(pack);
     s.clear();
     for (unsigned ci = 0; ci < 3; ci++)

0 comments (0 inline, 0 general)