Changeset 210
- Timestamp:
- 05/21/06 12:10:55 (16 years ago)
- Files:
-
- branches/libfreebob-2.0/src/libstreaming/AmdtpPort.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/AmdtpPortInfo.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/FreebobPosixThread.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/freebob_streaming.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/IsoHandler.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/IsoStream.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/PacketBuffer.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/Port.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/PortManager.cpp (modified) (5 diffs)
- branches/libfreebob-2.0/src/libstreaming/PortManager.h (modified) (2 diffs)
- branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/StreamRunner.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libfreebob-2.0/src/libstreaming/AmdtpPort.cpp
r207 r210 28 28 29 29 #include "AmdtpPort.h" 30 #include <assert.h> 30 31 31 32 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/AmdtpPortInfo.cpp
r207 r210 28 28 29 29 #include "AmdtpPortInfo.h" 30 #include <assert.h> 31 30 32 31 33 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp
r207 r210 28 28 29 29 #include "AmdtpStreamProcessor.h" 30 #include <assert.h> 31 30 32 31 33 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/FreebobPosixThread.cpp
r204 r210 30 30 #include <string.h> // for memset 31 31 #include <errno.h> 32 #include <assert.h> 33 32 34 33 35 namespace FreebobStreaming branches/libfreebob-2.0/src/libstreaming/freebob_streaming.cpp
r203 r210 35 35 #include "libfreebob/freebob_streaming.h" 36 36 #include "messagebuffer.h" 37 #include <assert.h> 38 37 39 38 40 freebob_device_t *freebob_streaming_init (freebob_device_info_t *device_info, freebob_options_t options) { branches/libfreebob-2.0/src/libstreaming/IsoHandler.cpp
r207 r210 31 31 #include <errno.h> 32 32 #include <netinet/in.h> 33 #include <assert.h> 34 33 35 34 36 #include <iostream> branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.cpp
r206 r210 30 30 #include "IsoHandler.h" 31 31 #include "IsoStream.h" 32 #include <assert.h> 33 32 34 33 35 namespace FreebobStreaming branches/libfreebob-2.0/src/libstreaming/IsoStream.cpp
r207 r210 29 29 #include "IsoStream.h" 30 30 #include "PacketBuffer.h" 31 #include <assert.h> 32 31 33 32 34 namespace FreebobStreaming branches/libfreebob-2.0/src/libstreaming/PacketBuffer.cpp
r201 r210 28 28 29 29 #include "PacketBuffer.h" 30 #include <assert.h> 31 30 32 31 33 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/Port.cpp
r206 r210 29 29 #include "Port.h" 30 30 #include <stdlib.h> 31 #include <assert.h> 32 31 33 32 34 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/PortManager.cpp
r207 r210 29 29 #include "PortManager.h" 30 30 #include "Port.h" 31 #include <assert.h> 32 31 33 32 34 namespace FreebobStreaming { 33 35 34 IMPL_DEBUG_MODULE( PortManager, PortManager, DEBUG_LEVEL_NORMAL );36 // IMPL_DEBUG_MODULE( PortManager, PortManager, DEBUG_LEVEL_NORMAL ); 35 37 36 38 PortManager::PortManager() { … … 44 46 int PortManager::addPort(Port *port) 45 47 { 46 debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");48 // debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n"); 47 49 assert(port); 48 50 49 51 switch(port->getBufferType()) { 50 52 case (Port::E_PacketBuffered): 51 debugOutput( DEBUG_LEVEL_VERBOSE, "Adding packet buffered port %s\n",port->getName().c_str());53 // debugOutput( DEBUG_LEVEL_VERBOSE, "Adding packet buffered port %s\n",port->getName().c_str()); 52 54 m_PacketPorts.push_back(port); 53 55 break; 54 56 case Port::E_PeriodBuffered: 55 debugOutput( DEBUG_LEVEL_VERBOSE, "Adding period buffered port %s\n",port->getName().c_str());57 // debugOutput( DEBUG_LEVEL_VERBOSE, "Adding period buffered port %s\n",port->getName().c_str()); 56 58 m_PeriodPorts.push_back(port); 57 59 break; … … 60 62 break;*/ 61 63 default: 62 debugFatal("Unsupported port type!");64 // debugFatal("Unsupported port type!"); 63 65 return -1; 64 66 } … … 69 71 int PortManager::deletePort(Port *port) 70 72 { 71 debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");73 // debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n"); 72 74 assert(port); 73 debugOutput( DEBUG_LEVEL_VERBOSE, "deleting port %s\n",port->getName().c_str());75 // debugOutput( DEBUG_LEVEL_VERBOSE, "deleting port %s\n",port->getName().c_str()); 74 76 75 77 for ( PortVectorIterator it = m_PacketPorts.begin(); … … 102 104 // } 103 105 // } 104 debugOutput( DEBUG_LEVEL_VERBOSE, " => port not found\n");106 // debugOutput( DEBUG_LEVEL_VERBOSE, " => port not found\n"); 105 107 106 108 return -1; //not found branches/libfreebob-2.0/src/libstreaming/PortManager.h
r207 r210 52 52 void prepare(); 53 53 54 void setVerboseLevel(int l) { setDebugLevel( l );};54 void setVerboseLevel(int l) { }; 55 55 56 56 protected: … … 59 59 // PortVector m_SamplePorts; 60 60 61 DECLARE_DEBUG_MODULE;61 // DECLARE_DEBUG_MODULE; 62 62 63 63 }; branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp
r207 r210 29 29 #include "StreamProcessor.h" 30 30 #include "StreamProcessorManager.h" 31 #include <assert.h> 31 32 32 33 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp
r207 r210 30 30 #include "StreamProcessor.h" 31 31 #include <errno.h> 32 #include <assert.h> 33 32 34 33 35 namespace FreebobStreaming { branches/libfreebob-2.0/src/libstreaming/StreamRunner.cpp
r204 r210 30 30 #include "StreamProcessorManager.h" 31 31 #include "IsoHandlerManager.h" 32 #include <assert.h> 33 32 34 33 35 namespace FreebobStreaming {