Show
Ignore:
Timestamp:
03/11/07 06:20:31 (17 years ago)
Author:
pieterpalmers
Message:

src/devicemanager:
- start OSC server for the device manager

src/devicemanager,
src/iavdevice,
src/libieee1394/configrom:
- inherit from OscNode? to become Osc'able

src/bounce,
src/libstreaming/AmdtpStreamProcessor,
src/libstreaming/AmdtpSlaveStreamProcessor:
- fixed bounce device implementation, now working

src/bebob:
- fixed midi bug

General:
- removed 'intermediate XML'
- removed obsolete tests
- removed obsolete files
- removed obsolete API calls

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/streaming-rework/libfreebob/freebob.h

    r386 r435  
    11/* freebob.h 
    2  * Copyright (C) 2005 Pieter Palmers 
     2 * Copyright (C) 2005,07 Pieter Palmers 
    33 * Copyright (C) 2006 Daniel Wagner 
    44 * 
     
    4141typedef struct freebob_handle* freebob_handle_t; 
    4242 
    43 /* 
    44  * Buffer specification 
    45  */ 
    46 typedef struct _freebob_stream_spec freebob_stream_spec_t; 
    47 typedef struct _freebob_stream_info freebob_stream_info_t; 
    48 typedef struct _freebob_connection_spec freebob_connection_spec_t; 
    49 typedef struct _freebob_connection_info freebob_connection_info_t; 
    50 typedef struct _freebob_supported_stream_format_spec freebob_supported_stream_format_spec_t; 
    51 typedef struct _freebob_supported_stream_format_info freebob_supported_stream_format_info_t; 
    52  
    53 /* 
    54  * Stream specification 
    55  */ 
    56 struct _freebob_stream_spec { 
    57     int location; 
    58     int position; 
    59     int format; 
    60     int type; 
    61     int destination_port; 
    62     char name[FREEBOB_MAX_NAME_LEN]; 
    63 }; 
    64  
    65 struct _freebob_stream_info { 
    66     int nb_streams; 
    67     freebob_stream_spec_t** streams; 
    68 }; 
    69  
    70 /* 
    71  * Connection specification 
    72  */ 
    73 struct _freebob_connection_spec { 
    74     int id; 
    75     int port; 
    76     int node; 
    77     int plug; 
    78     int dimension;  /* due to the midi stuff, the dimension isn't equal */ 
    79                     /* to the number of streams */ 
    80     int samplerate; /* this should be equal for all connections when */ 
    81                     /* using jack. maybe not when using other api's */ 
    82     int iso_channel; 
    83     enum freebob_direction direction; 
    84     int is_master; 
    85     freebob_stream_info_t* stream_info; 
    86 }; 
    87  
    88 /* 
    89  * topology info 
    90  */ 
    91 struct _freebob_connection_info { 
    92     int direction; 
    93     int nb_connections; 
    94     freebob_connection_spec_t** connections; 
    95 }; 
    96  
    97 /* 
    98  * Supported stream formats 
    99  */ 
    100 struct _freebob_supported_stream_format_spec { 
    101     int samplerate; 
    102     int nb_audio_channels; 
    103     int nb_midi_channels; 
    104 }; 
    105  
    106 struct _freebob_supported_stream_format_info { 
    107     int direction; 
    108     int nb_formats; 
    109     freebob_supported_stream_format_spec_t** formats; 
    110 }; 
    111  
    112  
    11343#ifdef __cplusplus 
    11444extern "C" { 
     
    12454freebob_discover_devices( freebob_handle_t freebob_handle, int verbose_level ); 
    12555 
    126  
    127 freebob_connection_info_t* 
    128 freebob_get_connection_info( freebob_handle_t freebob_handle, 
    129                              int node_id, 
    130                              enum freebob_direction direction ); 
    131  
    132 freebob_supported_stream_format_info_t* 
    133 freebob_get_supported_stream_format_info( freebob_handle_t freebob_handle, 
    134                                           int node_id, 
    135                                           enum freebob_direction direction ); 
    136  
    137 void 
    138 freebob_free_connection_info( freebob_connection_info_t* connection_info ); 
    139 void 
    140 freebob_free_connection_spec( freebob_connection_spec_t* connection_spec ); 
    141 void 
    142 freebob_free_stream_info( freebob_stream_info_t* stream_info ); 
    143 void 
    144 freebob_free_stream_spec( freebob_stream_spec_t* stream_spec ); 
    145 void 
    146 freebob_free_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info ); 
    147 void 
    148 freebob_free_supported_stream_format_spec( freebob_supported_stream_format_spec_t* stream_spec ); 
    149  
    150  
    151  
    152 void 
    153 freebob_print_connection_info( freebob_connection_info_t* connection_info ); 
    154 void 
    155 freebob_print_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info ); 
    156  
    15756int freebob_node_is_valid_freebob_device(freebob_handle_t fb_handle, int node_id); 
    15857int freebob_get_nb_devices_on_bus(freebob_handle_t fb_handle); 
     
    16160int freebob_set_samplerate(freebob_handle_t freebob_handle, int node_id, int samplerate); 
    16261 
    163 /* debug function */ 
    164 void 
    165 freebob_print_xml_description( freebob_handle_t freebob_handle, 
    166                                int node_id, 
    167                                enum freebob_direction direction ); 
    168  
     62/* ABI stuff */ 
    16963const char* 
    17064freebob_get_version(); 
  • branches/streaming-rework/libfreebob/freebob_streaming.h

    r424 r435  
    451451int freebob_streaming_transfer_capture_buffers(freebob_device_t *dev); 
    452452 
    453 /** 
    454  * Returns the packetizer thread to allow RT enabling by the host. 
    455  *  
    456  * @param dev the freebob device 
    457  * 
    458  * @return the thread. 
    459  */ 
    460 pthread_t freebob_streaming_get_packetizer_thread(freebob_device_t *dev); 
    461  
    462  
    463453#ifdef __cplusplus 
    464454} 
  • branches/streaming-rework/libfreebob/Makefile.am

    r336 r435  
    1919libfreebobincludedir = $(includedir)/libfreebob 
    2020 
    21 libfreebobinclude_HEADERS = freebob.h freebob_streaming.h xmlparser.h freebob_bounce.h 
     21libfreebobinclude_HEADERS = freebob.h freebob_streaming.h