[server] / trunk / server / src / mmdevice.cxx Repository:
ViewVC logotype

Diff of /trunk/server/src/mmdevice.cxx

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 595, Mon Feb 22 21:42:35 2010 UTC revision 596, Tue Feb 23 18:47:42 2010 UTC
# Line 69  Line 69 
69    
70    
71  /*  /*
72   * Process a command that was queueued because an async operation was in progress   * Process a command that was queued because an async operation was in progress
73   * when it was initially requested.   * when it was initially requested.
  *  
  * XXX if queued op fails send -ve completion event  
74   */   */
75  void MmDevice::processPendingCommand()  void MmDevice::processPendingCommand()
76  {  {
# Line 126  Line 124 
124          }          }
125  }  }
126    
127    
128  /*  /*
129   * Open the device.   * Open the device.
130   */   */
# Line 173  Line 172 
172                  return true;                  return true;
173          }          }
174    
175            /* XXX should be params */
176            bool transcode_audio = true;
177        bool transcode_video = true;
178    
179          if ( !other_audio_ && !other_video_ )          if ( !other_audio_ && !other_video_ )
180          {          {
181                  LOGDEBUG("MmDevice::connect() device: " << getDeviceName() <<                  LOGDEBUG("MmDevice::connect() device: " << getDeviceName() <<
# Line 187  Line 190 
190                  if ( other_audio )                  if ( other_audio )
191                  {                  {
192                          INIT_DM_PORT_CONNECT_INFO(&portConnectInfoList.port_connect_info[count]);                          INIT_DM_PORT_CONNECT_INFO(&portConnectInfoList.port_connect_info[count]);
193                          portConnectInfoList.port_connect_info[count].unFlags = DMFL_TRANSCODE_ON;                          portConnectInfoList.port_connect_info[count].unFlags = transcode_audio ? DMFL_TRANSCODE_ON : DMFL_TRANSCODE_NATIVE;
194                          portConnectInfoList.port_connect_info[count].port_info_tx = getAudioTxPortInfo();                          portConnectInfoList.port_connect_info[count].port_info_tx = getAudioTxPortInfo();
195                          portConnectInfoList.port_connect_info[count].port_info_rx = other_audio->getAudioRxPortInfo();                          portConnectInfoList.port_connect_info[count].port_info_rx = other_audio->getAudioRxPortInfo();
196                          count++;                          count++;
# Line 195  Line 198 
198                  if ( other_video )                  if ( other_video )
199                  {                  {
200                          INIT_DM_PORT_CONNECT_INFO(&portConnectInfoList.port_connect_info[count]);                          INIT_DM_PORT_CONNECT_INFO(&portConnectInfoList.port_connect_info[count]);
201                          portConnectInfoList.port_connect_info[count].unFlags = DMFL_TRANSCODE_ON;                          portConnectInfoList.port_connect_info[count].unFlags = transcode_video ? DMFL_TRANSCODE_ON : DMFL_TRANSCODE_NATIVE;
202                          portConnectInfoList.port_connect_info[count].port_info_tx = getVideoTxPortInfo();                          portConnectInfoList.port_connect_info[count].port_info_tx = getVideoTxPortInfo();
203                          portConnectInfoList.port_connect_info[count].port_info_rx = other_video->getVideoRxPortInfo();                          portConnectInfoList.port_connect_info[count].port_info_rx = other_video->getVideoRxPortInfo();
204                          count++;                          count++;
Legend:
Removed from v.595  
changed lines
  Added in v.596
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.8