From b84955d416f92e89c9d73999f545a2dec353d988 Mon Sep 17 00:00:00 2001 From: Barrett17 Date: Tue, 23 Oct 2018 15:19:14 +0200 Subject: [PATCH] media: Remove debug.h, finalize MediaDebug.h * Funny rust from 0 AD. --- headers/private/media/MediaDebug.h | 10 ++-- headers/private/media/TList.h | 2 +- headers/private/media/TMap.h | 2 +- headers/private/media/debug.h | 52 ------------------- src/kits/media/AddOnManager.cpp | 2 +- src/kits/media/Buffer.cpp | 2 +- src/kits/media/BufferCache.cpp | 2 +- src/kits/media/BufferConsumer.cpp | 2 +- src/kits/media/BufferGroup.cpp | 2 +- src/kits/media/BufferProducer.cpp | 2 +- src/kits/media/ChunkCache.cpp | 2 +- src/kits/media/Controllable.cpp | 2 +- src/kits/media/DataExchange.cpp | 2 +- src/kits/media/DefaultMediaTheme.cpp | 2 +- src/kits/media/DormantNodeManager.cpp | 2 +- src/kits/media/FileInterface.cpp | 2 +- src/kits/media/FormatManager.cpp | 2 +- src/kits/media/MediaAddOn.cpp | 2 +- src/kits/media/MediaDecoder.cpp | 2 +- src/kits/media/MediaDefs.cpp | 2 +- src/kits/media/MediaEncoder.cpp | 2 +- src/kits/media/MediaEventLooper.cpp | 2 +- src/kits/media/MediaExtractor.cpp | 2 +- src/kits/media/MediaFile.cpp | 2 +- src/kits/media/MediaFiles.cpp | 2 +- src/kits/media/MediaFormats.cpp | 2 +- src/kits/media/MediaNode.cpp | 2 +- src/kits/media/MediaRoster.cpp | 2 +- src/kits/media/MediaStreamer.cpp | 2 +- src/kits/media/MediaTheme.cpp | 2 +- src/kits/media/MediaWriter.cpp | 2 +- src/kits/media/Notifications.cpp | 2 +- src/kits/media/ParameterWeb.cpp | 2 +- src/kits/media/PlaySound.cpp | 2 +- src/kits/media/PluginManager.cpp | 2 +- src/kits/media/SharedBufferList.cpp | 2 +- src/kits/media/Sound.cpp | 2 +- src/kits/media/SoundFile.cpp | 2 +- src/kits/media/SoundPlayNode.cpp | 2 +- src/kits/media/SoundPlayer.cpp | 2 +- src/kits/media/TimeCode.cpp | 2 +- src/kits/media/TimeSource.cpp | 2 +- src/kits/media/TimeSourceObject.cpp | 2 +- src/kits/media/TimeSourceObjectManager.cpp | 2 +- src/kits/media/TimedEventQueue.cpp | 2 +- src/kits/media/TimedEventQueuePrivate.cpp | 2 +- src/kits/media/TimedEventQueuePrivate.h | 2 +- src/kits/media/TrackReader.cpp | 2 +- src/kits/media/experimental/AdapterIO.cpp | 2 +- src/kits/media/experimental/MediaClient.cpp | 2 +- .../media/experimental/MediaClientDefs.cpp | 2 +- .../media/experimental/MediaClientNode.cpp | 2 +- .../media/experimental/MediaConnection.cpp | 2 +- .../media/experimental/SimpleMediaClient.cpp | 2 +- src/kits/media/legacy/!missing_symbols.cpp | 2 +- src/kits/media/legacy/OldAudioModule.cpp | 2 +- src/kits/media/legacy/OldAudioStream.cpp | 2 +- src/kits/media/legacy/OldBufferStream.cpp | 2 +- .../media/legacy/OldBufferStreamManager.cpp | 2 +- src/kits/media/legacy/OldMediaModule.cpp | 2 +- src/kits/media/legacy/OldSubscriber.cpp | 2 +- src/kits/media/request_data.cpp | 2 +- 62 files changed, 65 insertions(+), 117 deletions(-) delete mode 100644 headers/private/media/debug.h diff --git a/headers/private/media/MediaDebug.h b/headers/private/media/MediaDebug.h index b1fabab569..b81dac8857 100644 --- a/headers/private/media/MediaDebug.h +++ b/headers/private/media/MediaDebug.h @@ -2,7 +2,7 @@ #define _MEDIA_DEBUG_OLD_H_ #ifndef DEBUG - #define DEBUG 1 + #define DEBUG 0 #endif #include @@ -18,8 +18,8 @@ inline void PRINT(int level, const char *fmt, ...) { va_list ap; if (level > DEBUG) return; va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); } #define PRINT_FORMAT(_text, _fmt) do { char _buf[300]; string_for_format((_fmt), _buf, sizeof(_buf)); printf("%s %s\n", (_text), (_buf)); } while (0) - #define PRINT_INPUT(_text, _in) do { char _buf[300]; string_for_format((_in).format, _buf, sizeof(_buf)); printf("%s node(node %ld, port %ld); source(port %ld, id %ld); dest(port %ld, id %ld); fmt(%s); name(%s)\n", (_text), (_in).node.node, (_in).node.port, (_in).source.port, (_in).source.id, (_in).destination.port, (_in).destination.id, _buf, (_in).name); } while (0) - #define PRINT_OUTPUT(_text, _out) do { char _buf[300]; string_for_format((_out).format, _buf, sizeof(_buf)); printf("%s node(node %ld, port %ld); source(port %ld, id %ld); dest(port %ld, id %ld); fmt(%s); name(%s)\n", (_text), (_out).node.node, (_out).node.port, (_out).source.port, (_out).source.id, (_out).destination.port, (_out).destination.id, _buf, (_out).name); } while (0) + #define PRINT_INPUT(_text, _in) do { char _buf[300]; string_for_format((_in).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_in).node.node, (_in).node.port, (_in).source.port, (_in).source.id, (_in).destination.port, (_in).destination.id, _buf, (_in).name); } while (0) + #define PRINT_OUTPUT(_text, _out) do { char _buf[300]; string_for_format((_out).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_out).node.node, (_out).node.port, (_out).source.port, (_out).source.id, (_out).destination.port, (_out).destination.id, _buf, (_out).name); } while (0) #if DEBUG >= 2 #define BROKEN() printf("BROKEN %s\n",__PRETTY_FUNCTION__) @@ -40,11 +40,11 @@ #define PRINT_FORMAT(_text, _fmt) ((void)0) #define PRINT_INPUT(_text, _in) ((void)0) #define PRINT_OUTPUT(_text, _out) ((void)0) - #define UNIMPLEMENTED() ((void)0) + #define UNIMPLEMENTED() printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__) #define BROKEN() ((void)0) #define CALLED() ((void)0) #define PRINT(l, a...) ((void)0) - #define ERROR(a...) ((void)0) + #define ERROR(a...) fprintf(stderr, a) #define TRACE(a...) ((void)0) #endif diff --git a/headers/private/media/TList.h b/headers/private/media/TList.h index 52fd782a37..96aaf94bdf 100644 --- a/headers/private/media/TList.h +++ b/headers/private/media/TList.h @@ -1,7 +1,7 @@ #ifndef _MEDIA_T_LIST_H #define _MEDIA_T_LIST_H -#include "debug.h" +#include "MediaDebug.h" template class List { diff --git a/headers/private/media/TMap.h b/headers/private/media/TMap.h index 85bb262664..367e016d70 100644 --- a/headers/private/media/TMap.h +++ b/headers/private/media/TMap.h @@ -2,7 +2,7 @@ #define _MEDIA_T_MAP_H -#include "debug.h" +#include "MediaDebug.h" template class Map { diff --git a/headers/private/media/debug.h b/headers/private/media/debug.h deleted file mode 100644 index b81dac8857..0000000000 --- a/headers/private/media/debug.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef _MEDIA_DEBUG_OLD_H_ -#define _MEDIA_DEBUG_OLD_H_ - -#ifndef DEBUG - #define DEBUG 0 -#endif - -#include -#include - -#undef TRACE -#undef PRINT - -#if DEBUG > 0 - - #define UNIMPLEMENTED() printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__) - inline void ERROR(const char *fmt, ...) { va_list ap; va_start(ap, fmt); printf("### ERROR: "); vprintf(fmt, ap); va_end(ap); } - inline void PRINT(int level, const char *fmt, ...) { va_list ap; if (level > DEBUG) return; va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); } - - #define PRINT_FORMAT(_text, _fmt) do { char _buf[300]; string_for_format((_fmt), _buf, sizeof(_buf)); printf("%s %s\n", (_text), (_buf)); } while (0) - #define PRINT_INPUT(_text, _in) do { char _buf[300]; string_for_format((_in).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_in).node.node, (_in).node.port, (_in).source.port, (_in).source.id, (_in).destination.port, (_in).destination.id, _buf, (_in).name); } while (0) - #define PRINT_OUTPUT(_text, _out) do { char _buf[300]; string_for_format((_out).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_out).node.node, (_out).node.port, (_out).source.port, (_out).source.id, (_out).destination.port, (_out).destination.id, _buf, (_out).name); } while (0) - - #if DEBUG >= 2 - #define BROKEN() printf("BROKEN %s\n",__PRETTY_FUNCTION__) - #define TRACE printf - #else - #define BROKEN() ((void)0) - #define TRACE(a...) ((void)0) - #endif - - #if DEBUG >= 3 - #define CALLED() printf("CALLED %s\n",__PRETTY_FUNCTION__) - #else - #define CALLED() ((void)0) - #endif - -#else - - #define PRINT_FORMAT(_text, _fmt) ((void)0) - #define PRINT_INPUT(_text, _in) ((void)0) - #define PRINT_OUTPUT(_text, _out) ((void)0) - #define UNIMPLEMENTED() printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__) - #define BROKEN() ((void)0) - #define CALLED() ((void)0) - #define PRINT(l, a...) ((void)0) - #define ERROR(a...) fprintf(stderr, a) - #define TRACE(a...) ((void)0) - -#endif - -#endif /* _MEDIA_DEBUG_H_ */ diff --git a/src/kits/media/AddOnManager.cpp b/src/kits/media/AddOnManager.cpp index 66aff824a6..8ef6228005 100644 --- a/src/kits/media/AddOnManager.cpp +++ b/src/kits/media/AddOnManager.cpp @@ -23,7 +23,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #include "FormatManager.h" #include "MetaFormat.h" diff --git a/src/kits/media/Buffer.cpp b/src/kits/media/Buffer.cpp index a3560a00de..6d1988cb06 100644 --- a/src/kits/media/Buffer.cpp +++ b/src/kits/media/Buffer.cpp @@ -37,7 +37,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" #include "SharedBufferList.h" diff --git a/src/kits/media/BufferCache.cpp b/src/kits/media/BufferCache.cpp index 02ea7213f2..9ebf9d6216 100644 --- a/src/kits/media/BufferCache.cpp +++ b/src/kits/media/BufferCache.cpp @@ -12,7 +12,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" namespace BPrivate { diff --git a/src/kits/media/BufferConsumer.cpp b/src/kits/media/BufferConsumer.cpp index 7171140f27..73c0626194 100644 --- a/src/kits/media/BufferConsumer.cpp +++ b/src/kits/media/BufferConsumer.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include diff --git a/src/kits/media/BufferGroup.cpp b/src/kits/media/BufferGroup.cpp index e589aa30fb..552029262b 100644 --- a/src/kits/media/BufferGroup.cpp +++ b/src/kits/media/BufferGroup.cpp @@ -32,7 +32,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" #include "SharedBufferList.h" diff --git a/src/kits/media/BufferProducer.cpp b/src/kits/media/BufferProducer.cpp index 95f6793230..4509d474e1 100644 --- a/src/kits/media/BufferProducer.cpp +++ b/src/kits/media/BufferProducer.cpp @@ -10,7 +10,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" #include "MediaMisc.h" diff --git a/src/kits/media/ChunkCache.cpp b/src/kits/media/ChunkCache.cpp index 68de9df754..6e0222c322 100644 --- a/src/kits/media/ChunkCache.cpp +++ b/src/kits/media/ChunkCache.cpp @@ -10,7 +10,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" // #pragma mark - diff --git a/src/kits/media/Controllable.cpp b/src/kits/media/Controllable.cpp index 6c722245e5..e6228f691a 100644 --- a/src/kits/media/Controllable.cpp +++ b/src/kits/media/Controllable.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/src/kits/media/DataExchange.cpp b/src/kits/media/DataExchange.cpp index 8c33d14ee6..1e21085122 100644 --- a/src/kits/media/DataExchange.cpp +++ b/src/kits/media/DataExchange.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include diff --git a/src/kits/media/DefaultMediaTheme.cpp b/src/kits/media/DefaultMediaTheme.cpp index fbb15aa2cf..c681802554 100644 --- a/src/kits/media/DefaultMediaTheme.cpp +++ b/src/kits/media/DefaultMediaTheme.cpp @@ -22,7 +22,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" using namespace BPrivate; diff --git a/src/kits/media/DormantNodeManager.cpp b/src/kits/media/DormantNodeManager.cpp index e66c366667..0f711bcf7d 100644 --- a/src/kits/media/DormantNodeManager.cpp +++ b/src/kits/media/DormantNodeManager.cpp @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/kits/media/FileInterface.cpp b/src/kits/media/FileInterface.cpp index c3c8d3d0ac..c2be4db6e5 100644 --- a/src/kits/media/FileInterface.cpp +++ b/src/kits/media/FileInterface.cpp @@ -10,7 +10,7 @@ * */ -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" #include #include diff --git a/src/kits/media/FormatManager.cpp b/src/kits/media/FormatManager.cpp index 61ce237054..dce7021a39 100644 --- a/src/kits/media/FormatManager.cpp +++ b/src/kits/media/FormatManager.cpp @@ -17,7 +17,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #define TIMEOUT 5000000LL diff --git a/src/kits/media/MediaAddOn.cpp b/src/kits/media/MediaAddOn.cpp index e018e6771b..2af2b6f785 100644 --- a/src/kits/media/MediaAddOn.cpp +++ b/src/kits/media/MediaAddOn.cpp @@ -32,7 +32,7 @@ #include #include #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" diff --git a/src/kits/media/MediaDecoder.cpp b/src/kits/media/MediaDecoder.cpp index 8a64a2cbcd..868d178b40 100644 --- a/src/kits/media/MediaDecoder.cpp +++ b/src/kits/media/MediaDecoder.cpp @@ -7,7 +7,7 @@ #include #include #include "PluginManager.h" -#include "debug.h" +#include "MediaDebug.h" /************************************************************* * public BMediaDecoder diff --git a/src/kits/media/MediaDefs.cpp b/src/kits/media/MediaDefs.cpp index a8c2829707..d69846832b 100644 --- a/src/kits/media/MediaDefs.cpp +++ b/src/kits/media/MediaDefs.cpp @@ -28,7 +28,7 @@ #include "AddOnManager.h" #include "DataExchange.h" -#include "debug.h" +#include "MediaDebug.h" #include "MediaMisc.h" #include "MediaRosterEx.h" diff --git a/src/kits/media/MediaEncoder.cpp b/src/kits/media/MediaEncoder.cpp index 9f0a198c3b..4030efb93e 100644 --- a/src/kits/media/MediaEncoder.cpp +++ b/src/kits/media/MediaEncoder.cpp @@ -14,7 +14,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" /************************************************************* * public BMediaEncoder diff --git a/src/kits/media/MediaEventLooper.cpp b/src/kits/media/MediaEventLooper.cpp index 6f43cf6112..90931b9198 100644 --- a/src/kits/media/MediaEventLooper.cpp +++ b/src/kits/media/MediaEventLooper.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "debug.h" +#include "MediaDebug.h" /************************************************************* * protected BMediaEventLooper diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/media/MediaExtractor.cpp index b9f3bb5e9c..1241e76152 100644 --- a/src/kits/media/MediaExtractor.cpp +++ b/src/kits/media/MediaExtractor.cpp @@ -16,7 +16,7 @@ #include #include "ChunkCache.h" -#include "debug.h" +#include "MediaDebug.h" #include "PluginManager.h" diff --git a/src/kits/media/MediaFile.cpp b/src/kits/media/MediaFile.cpp index 79b0f0ed35..ffde93f9d2 100644 --- a/src/kits/media/MediaFile.cpp +++ b/src/kits/media/MediaFile.cpp @@ -15,7 +15,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #include "MediaExtractor.h" #include "MediaStreamer.h" diff --git a/src/kits/media/MediaFiles.cpp b/src/kits/media/MediaFiles.cpp index 2779d35340..778604a1e4 100644 --- a/src/kits/media/MediaFiles.cpp +++ b/src/kits/media/MediaFiles.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include const char BMediaFiles::B_SOUNDS[] = "Sounds"; diff --git a/src/kits/media/MediaFormats.cpp b/src/kits/media/MediaFormats.cpp index 13a9e8e2db..bc2afa76a1 100644 --- a/src/kits/media/MediaFormats.cpp +++ b/src/kits/media/MediaFormats.cpp @@ -12,7 +12,7 @@ #include "DataExchange.h" #include "FormatManager.h" #include "MetaFormat.h" -#include "debug.h" +#include "MediaDebug.h" #include #include diff --git a/src/kits/media/MediaNode.cpp b/src/kits/media/MediaNode.cpp index 362c3f3919..3802e3ffc0 100644 --- a/src/kits/media/MediaNode.cpp +++ b/src/kits/media/MediaNode.cpp @@ -41,7 +41,7 @@ #include #include "DataExchange.h" -#include "debug.h" +#include "MediaDebug.h" #include "MediaMisc.h" #include "MediaRosterEx.h" #include "Notifications.h" diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp index f1cd6ceb5c..9baae950d2 100644 --- a/src/kits/media/MediaRoster.cpp +++ b/src/kits/media/MediaRoster.cpp @@ -61,7 +61,7 @@ char __dont_remove_copyright_from_binary[] = "Copyright (c) 2002-2006 Marcus " #include #include -#include +#include #include #include #include diff --git a/src/kits/media/MediaStreamer.cpp b/src/kits/media/MediaStreamer.cpp index 440472f105..e4e71b5f3e 100644 --- a/src/kits/media/MediaStreamer.cpp +++ b/src/kits/media/MediaStreamer.cpp @@ -9,7 +9,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #include "PluginManager.h" diff --git a/src/kits/media/MediaTheme.cpp b/src/kits/media/MediaTheme.cpp index bf18b6a92d..e7049a8a68 100644 --- a/src/kits/media/MediaTheme.cpp +++ b/src/kits/media/MediaTheme.cpp @@ -9,7 +9,7 @@ #include "DefaultMediaTheme.h" -#include "debug.h" +#include "MediaDebug.h" #include #include diff --git a/src/kits/media/MediaWriter.cpp b/src/kits/media/MediaWriter.cpp index 8df949f328..994795498b 100644 --- a/src/kits/media/MediaWriter.cpp +++ b/src/kits/media/MediaWriter.cpp @@ -13,7 +13,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #include "PluginManager.h" diff --git a/src/kits/media/Notifications.cpp b/src/kits/media/Notifications.cpp index 4fb66bed71..421c1d4490 100644 --- a/src/kits/media/Notifications.cpp +++ b/src/kits/media/Notifications.cpp @@ -44,7 +44,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" diff --git a/src/kits/media/ParameterWeb.cpp b/src/kits/media/ParameterWeb.cpp index c7fb13c519..bd5eb4186a 100644 --- a/src/kits/media/ParameterWeb.cpp +++ b/src/kits/media/ParameterWeb.cpp @@ -23,7 +23,7 @@ #include #include "DataExchange.h" -#include "debug.h" +#include "MediaDebug.h" #include "MediaMisc.h" diff --git a/src/kits/media/PlaySound.cpp b/src/kits/media/PlaySound.cpp index ce7ad1b27b..f91be6d43f 100644 --- a/src/kits/media/PlaySound.cpp +++ b/src/kits/media/PlaySound.cpp @@ -9,7 +9,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" sound_handle play_sound(const entry_ref *soundRef, bool mix, diff --git a/src/kits/media/PluginManager.cpp b/src/kits/media/PluginManager.cpp index c7fa5cf1ea..a6828eefae 100644 --- a/src/kits/media/PluginManager.cpp +++ b/src/kits/media/PluginManager.cpp @@ -18,7 +18,7 @@ #include "AddOnManager.h" #include "PluginManager.h" #include "DataExchange.h" -#include "debug.h" +#include "MediaDebug.h" PluginManager gPluginManager; diff --git a/src/kits/media/SharedBufferList.cpp b/src/kits/media/SharedBufferList.cpp index d020c5c870..403c708b99 100644 --- a/src/kits/media/SharedBufferList.cpp +++ b/src/kits/media/SharedBufferList.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/src/kits/media/Sound.cpp b/src/kits/media/Sound.cpp index 711012264a..d4ebd0398a 100644 --- a/src/kits/media/Sound.cpp +++ b/src/kits/media/Sound.cpp @@ -12,7 +12,7 @@ #include "TrackReader.h" -#include +#include #include #include diff --git a/src/kits/media/SoundFile.cpp b/src/kits/media/SoundFile.cpp index 3a18e4bb46..776b737297 100644 --- a/src/kits/media/SoundFile.cpp +++ b/src/kits/media/SoundFile.cpp @@ -9,7 +9,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" /************************************************************* * public BSoundFile diff --git a/src/kits/media/SoundPlayNode.cpp b/src/kits/media/SoundPlayNode.cpp index 6587248a6d..a2737e5e03 100644 --- a/src/kits/media/SoundPlayNode.cpp +++ b/src/kits/media/SoundPlayNode.cpp @@ -20,7 +20,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" #define SEND_NEW_BUFFER_EVENT (BTimedEventQueue::B_USER_EVENT + 1) diff --git a/src/kits/media/SoundPlayer.cpp b/src/kits/media/SoundPlayer.cpp index c62e1d7d6d..d62658e269 100644 --- a/src/kits/media/SoundPlayer.cpp +++ b/src/kits/media/SoundPlayer.cpp @@ -21,7 +21,7 @@ #include "SoundPlayNode.h" -#include "debug.h" +#include "MediaDebug.h" // Flags used internally in BSoundPlayer diff --git a/src/kits/media/TimeCode.cpp b/src/kits/media/TimeCode.cpp index b805cfaa37..d277fcc78c 100644 --- a/src/kits/media/TimeCode.cpp +++ b/src/kits/media/TimeCode.cpp @@ -4,7 +4,7 @@ * DESCR: Handles all TimeCode functions. ***********************************************************************/ #include -#include "debug.h" +#include "MediaDebug.h" #include status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code) diff --git a/src/kits/media/TimeSource.cpp b/src/kits/media/TimeSource.cpp index fa7e7be03e..b692ff5671 100644 --- a/src/kits/media/TimeSource.cpp +++ b/src/kits/media/TimeSource.cpp @@ -14,7 +14,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #include "DataExchange.h" #include "ServerInterface.h" #include "TimeSourceObject.h" diff --git a/src/kits/media/TimeSourceObject.cpp b/src/kits/media/TimeSourceObject.cpp index f300c472d4..8f76da08fd 100644 --- a/src/kits/media/TimeSourceObject.cpp +++ b/src/kits/media/TimeSourceObject.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include "TimeSourceObjectManager.h" diff --git a/src/kits/media/TimeSourceObjectManager.cpp b/src/kits/media/TimeSourceObjectManager.cpp index ce0f61004d..e1b0de40b8 100644 --- a/src/kits/media/TimeSourceObjectManager.cpp +++ b/src/kits/media/TimeSourceObjectManager.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "TimeSourceObject.h" diff --git a/src/kits/media/TimedEventQueue.cpp b/src/kits/media/TimedEventQueue.cpp index cf270cea81..0b382fa036 100644 --- a/src/kits/media/TimedEventQueue.cpp +++ b/src/kits/media/TimedEventQueue.cpp @@ -7,7 +7,7 @@ #include #include #include "TimedEventQueuePrivate.h" -#include "debug.h" +#include "MediaDebug.h" /************************************************************* * struct media_timed_event diff --git a/src/kits/media/TimedEventQueuePrivate.cpp b/src/kits/media/TimedEventQueuePrivate.cpp index 0436d98c50..75811bb7e8 100644 --- a/src/kits/media/TimedEventQueuePrivate.cpp +++ b/src/kits/media/TimedEventQueuePrivate.cpp @@ -40,7 +40,7 @@ #include "TimedEventQueuePrivate.h" #include "Debug.h" -#include "debug.h" +#include "MediaDebug.h" _event_queue_imp::_event_queue_imp() : fLock(new BLocker("BTimedEventQueue locker")), diff --git a/src/kits/media/TimedEventQueuePrivate.h b/src/kits/media/TimedEventQueuePrivate.h index 70030101f2..871faddbbf 100644 --- a/src/kits/media/TimedEventQueuePrivate.h +++ b/src/kits/media/TimedEventQueuePrivate.h @@ -10,7 +10,7 @@ #include #include -#include "debug.h" +#include "MediaDebug.h" struct _event_queue_imp { diff --git a/src/kits/media/TrackReader.cpp b/src/kits/media/TrackReader.cpp index f9d1c3ecc6..a07c0265fb 100644 --- a/src/kits/media/TrackReader.cpp +++ b/src/kits/media/TrackReader.cpp @@ -37,7 +37,7 @@ #include #include #include "TrackReader.h" -#include "debug.h" +#include "MediaDebug.h" namespace BPrivate { diff --git a/src/kits/media/experimental/AdapterIO.cpp b/src/kits/media/experimental/AdapterIO.cpp index e164868e5e..ed890af8be 100644 --- a/src/kits/media/experimental/AdapterIO.cpp +++ b/src/kits/media/experimental/AdapterIO.cpp @@ -10,7 +10,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #define TIMEOUT_QUANTA 100000 diff --git a/src/kits/media/experimental/MediaClient.cpp b/src/kits/media/experimental/MediaClient.cpp index 10a66ba6b0..3b15b730d3 100755 --- a/src/kits/media/experimental/MediaClient.cpp +++ b/src/kits/media/experimental/MediaClient.cpp @@ -12,7 +12,7 @@ #include "MediaClientNode.h" -#include "debug.h" +#include "MediaDebug.h" namespace BPrivate { namespace media { diff --git a/src/kits/media/experimental/MediaClientDefs.cpp b/src/kits/media/experimental/MediaClientDefs.cpp index 8b77275e65..b0566d9c6f 100644 --- a/src/kits/media/experimental/MediaClientDefs.cpp +++ b/src/kits/media/experimental/MediaClientDefs.cpp @@ -8,7 +8,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" media_client_id diff --git a/src/kits/media/experimental/MediaClientNode.cpp b/src/kits/media/experimental/MediaClientNode.cpp index 66d6b35d31..95f6d3ead3 100755 --- a/src/kits/media/experimental/MediaClientNode.cpp +++ b/src/kits/media/experimental/MediaClientNode.cpp @@ -13,7 +13,7 @@ #include -#include "debug.h" +#include "MediaDebug.h" #define B_NEW_BUFFER (BTimedEventQueue::B_USER_EVENT + 1) diff --git a/src/kits/media/experimental/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp index 5470b440c9..68f0d4f929 100644 --- a/src/kits/media/experimental/MediaConnection.cpp +++ b/src/kits/media/experimental/MediaConnection.cpp @@ -9,7 +9,7 @@ #include "MediaClientNode.h" -#include "debug.h" +#include "MediaDebug.h" BMediaConnection::BMediaConnection(media_connection_kinds kinds, diff --git a/src/kits/media/experimental/SimpleMediaClient.cpp b/src/kits/media/experimental/SimpleMediaClient.cpp index 1f1b93c228..efa785369d 100644 --- a/src/kits/media/experimental/SimpleMediaClient.cpp +++ b/src/kits/media/experimental/SimpleMediaClient.cpp @@ -5,7 +5,7 @@ #include -#include +#include BSimpleMediaClient::BSimpleMediaClient(const char* name, diff --git a/src/kits/media/legacy/!missing_symbols.cpp b/src/kits/media/legacy/!missing_symbols.cpp index b3c7ff93e6..c80a68a756 100644 --- a/src/kits/media/legacy/!missing_symbols.cpp +++ b/src/kits/media/legacy/!missing_symbols.cpp @@ -5,7 +5,7 @@ * All return codes are guessed!!! (void most times means it's still wrong) ***********************************************************************/ #include -#include "debug.h" +#include "MediaDebug.h" #if 0 // SoundPlay 4.8 is evil, uses undocumented media kit API diff --git a/src/kits/media/legacy/OldAudioModule.cpp b/src/kits/media/legacy/OldAudioModule.cpp index b6ffdad173..f580b8e6c0 100644 --- a/src/kits/media/legacy/OldAudioModule.cpp +++ b/src/kits/media/legacy/OldAudioModule.cpp @@ -12,7 +12,7 @@ #include "OldAudioModule.h" -#include +#include /************************************************************* diff --git a/src/kits/media/legacy/OldAudioStream.cpp b/src/kits/media/legacy/OldAudioStream.cpp index f9541db6ca..682c3dba09 100644 --- a/src/kits/media/legacy/OldAudioStream.cpp +++ b/src/kits/media/legacy/OldAudioStream.cpp @@ -12,7 +12,7 @@ #include "OldAudioStream.h" -#include +#include /************************************************************* diff --git a/src/kits/media/legacy/OldBufferStream.cpp b/src/kits/media/legacy/OldBufferStream.cpp index 248e595dd9..f34941377e 100644 --- a/src/kits/media/legacy/OldBufferStream.cpp +++ b/src/kits/media/legacy/OldBufferStream.cpp @@ -12,7 +12,7 @@ #include "OldBufferStream.h" -#include +#include #include diff --git a/src/kits/media/legacy/OldBufferStreamManager.cpp b/src/kits/media/legacy/OldBufferStreamManager.cpp index 96d6c1fff7..d6ab6b6ef1 100644 --- a/src/kits/media/legacy/OldBufferStreamManager.cpp +++ b/src/kits/media/legacy/OldBufferStreamManager.cpp @@ -12,7 +12,7 @@ #include "OldBufferStreamManager.h" -#include +#include /************************************************************* diff --git a/src/kits/media/legacy/OldMediaModule.cpp b/src/kits/media/legacy/OldMediaModule.cpp index 3d9ec9d7de..39d12aaf1e 100644 --- a/src/kits/media/legacy/OldMediaModule.cpp +++ b/src/kits/media/legacy/OldMediaModule.cpp @@ -12,7 +12,7 @@ #include "OldMediaModule.h" -#include +#include /************************************************************* diff --git a/src/kits/media/legacy/OldSubscriber.cpp b/src/kits/media/legacy/OldSubscriber.cpp index 542c714dcb..1ef2ce881e 100644 --- a/src/kits/media/legacy/OldSubscriber.cpp +++ b/src/kits/media/legacy/OldSubscriber.cpp @@ -12,7 +12,7 @@ #include "OldSubscriber.h" -#include "debug.h" +#include "MediaDebug.h" /************************************************************* diff --git a/src/kits/media/request_data.cpp b/src/kits/media/request_data.cpp index 3af50ca71b..c4b9fe7a7c 100644 --- a/src/kits/media/request_data.cpp +++ b/src/kits/media/request_data.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace BPrivate {