/[pkg-freebob]/libfreebob/trunk/src/freebob.cpp
ViewVC logotype

Diff of /libfreebob/trunk/src/freebob.cpp

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

revision 278 by marciotex-guest, Tue Apr 11 20:08:53 2006 UTC revision 279 by marciotex-guest, Fri Apr 28 14:38:11 2006 UTC
# Line 27  Line 27 
27  #include "debugmodule/debugmodule.h"  #include "debugmodule/debugmodule.h"
28  #include "fbtypes.h"  #include "fbtypes.h"
29  #include "devicemanager.h"  #include "devicemanager.h"
30  #include "avdevice.h"  #include "iavdevice.h"
31    
32    #include "libfreebobavc/avc_generic.h"
33    
34  #include <stdio.h>  #include <stdio.h>
35  #include <stdlib.h>  #include <stdlib.h>
# Line 52  freebob_new_handle( int port ) Line 54  freebob_new_handle( int port )
54          return 0;          return 0;
55      }      }
56    
57      handle->m_deviceManager = new DeviceManager;      handle->m_deviceManager = new DeviceManager();
58      if ( !handle->m_deviceManager ) {      if ( !handle->m_deviceManager ) {
59          debugFatal( "Could not allocate device manager\n" );          debugFatal( "Could not allocate device manager\n" );
60          delete handle;          delete handle;
# Line 76  freebob_destroy_handle( freebob_handle_t Line 78  freebob_destroy_handle( freebob_handle_t
78  }  }
79    
80  int  int
81  freebob_discover_devices( freebob_handle_t freebob_handle )  freebob_discover_devices( freebob_handle_t freebob_handle, int verbose )
82  {  {
83      return freebob_handle->m_deviceManager->discover()? 0 : -1;      return freebob_handle->m_deviceManager->discover(verbose)? 0 : -1;
84  }  }
85    
86  freebob_connection_info_t*  freebob_connection_info_t*
# Line 132  freebob_get_device_node_id( freebob_hand Line 134  freebob_get_device_node_id( freebob_hand
134  int  int
135  freebob_set_samplerate( freebob_handle_t freebob_handle, int node_id, int samplerate )  freebob_set_samplerate( freebob_handle_t freebob_handle, int node_id, int samplerate )
136  {  {
137      AvDevice* avDevice = freebob_handle->m_deviceManager->getAvDevice( node_id );      IAvDevice* avDevice = freebob_handle->m_deviceManager->getAvDevice( node_id );
138      if ( avDevice ) {      if ( avDevice ) {
139          if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {          if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
140              return freebob_handle->m_deviceManager->discover()? 1 : 0;              return freebob_handle->m_deviceManager->discover(0)? 1 : 0;
141          }  
142            // retry
143            } else if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
144                return freebob_handle->m_deviceManager->discover(0)? 1 : 0;
145            // failed
146            } else {
147                return -1;
148            }
149      }      }
150      return 0;      return -1;
151  }  }
152    
153  void  void
# Line 332  freebob_print_xml_description( freebob_h Line 341  freebob_print_xml_description( freebob_h
341          xmlFree(doc);          xmlFree(doc);
342      return;      return;
343  }  }
344    
345    void freebob_sleep_after_avc_command( int time )
346    {
347        AVCCommand::setSleepAfterAVCCommand( time );
348    }

Legend:
Removed from v.278  
changed lines
  Added in v.279

  ViewVC Help
Powered by ViewVC 1.1.5