hrev51829 adds 1 changeset to branch 'master'
old head: 6072c6f1cbfd0de438e5422f7661016469be60e5
new head: 2cb3cabcb0e3362a8185c8fdb8ba7a386e5800f0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2cb3cabcb0e3+%5E6072c6f1cbfd
----------------------------------------------------------------------------
2cb3cabcb0e3: MediaClient: Revert debugging edits
* The -a argument ended up in my git commit inadvently,
sorry about that.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51829
Commit: 2cb3cabcb0e3362a8185c8fdb8ba7a386e5800f0
URL: http://cgit.haiku-os.org/haiku/commit/?id=2cb3cabcb0e3
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sat Mar 3 15:20:28 2018 UTC
----------------------------------------------------------------------------
4 files changed, 5 insertions(+), 13 deletions(-)
src/bin/media_client/MediaTest.cpp | 10 +++++-----
src/kits/media/experimental/MediaClient.cpp | 2 --
src/kits/media/experimental/MediaClientNode.cpp | 4 ----
src/kits/media/experimental/MediaConnection.cpp | 2 --
----------------------------------------------------------------------------
diff --git a/src/bin/media_client/MediaTest.cpp
b/src/bin/media_client/MediaTest.cpp
index 2790d0d49a..120b92a284 100644
--- a/src/bin/media_client/MediaTest.cpp
+++ b/src/bin/media_client/MediaTest.cpp
@@ -77,7 +77,7 @@ _ConsumerProducerTest()
assert(input->Disconnect() == B_OK);
- //_DeleteClients();
+ _DeleteClients();
}
@@ -131,10 +131,10 @@ media_test()
{
printf("Testing Simple (1:1) Producer-Consumer configuration: ");
_ConsumerProducerTest();
- //_ProducerConsumerTest();
- //printf("OK\n");
+ _ProducerConsumerTest();
+ printf("OK\n");
- //printf("Testing Simple (1:1:1) Producer-Filter-Consumer
configuration: ");
- //_ProducerFilterConsumerTest();
+ printf("Testing Simple (1:1:1) Producer-Filter-Consumer configuration:
");
+ _ProducerFilterConsumerTest();
printf("OK\n");
}
diff --git a/src/kits/media/experimental/MediaClient.cpp
b/src/kits/media/experimental/MediaClient.cpp
index a5dc78e087..10a66ba6b0 100755
--- a/src/kits/media/experimental/MediaClient.cpp
+++ b/src/kits/media/experimental/MediaClient.cpp
@@ -12,8 +12,6 @@
#include "MediaClientNode.h"
-#define DEBUG 3
-
#include "debug.h"
diff --git a/src/kits/media/experimental/MediaClientNode.cpp
b/src/kits/media/experimental/MediaClientNode.cpp
index 1fa66a3ddc..66d6b35d31 100755
--- a/src/kits/media/experimental/MediaClientNode.cpp
+++ b/src/kits/media/experimental/MediaClientNode.cpp
@@ -13,8 +13,6 @@
#include <string.h>
-#define DEBUG 3
-
#include "debug.h"
#define B_NEW_BUFFER (BTimedEventQueue::B_USER_EVENT + 1)
@@ -347,13 +345,11 @@ BMediaClientNode::GetNextOutput(int32* cookie,
media_output* output)
if (*cookie < 0 || *cookie >= fOwner->CountOutputs()) {
*cookie = -1;
output = NULL;
- printf("cookie %ld\n", *cookie);
} else {
BMediaOutput* conn = fOwner->OutputAt(*cookie);
if (conn != NULL) {
*output = conn->fConnection._BuildMediaOutput();
*cookie += 1;
- printf("OK cookie %ld\n", *cookie);
return B_OK;
}
}
diff --git a/src/kits/media/experimental/MediaConnection.cpp
b/src/kits/media/experimental/MediaConnection.cpp
index 4971397c0b..5470b440c9 100644
--- a/src/kits/media/experimental/MediaConnection.cpp
+++ b/src/kits/media/experimental/MediaConnection.cpp
@@ -9,8 +9,6 @@
#include "MediaClientNode.h"
-#define DEBUG 3
-
#include "debug.h"
