Changeset 502

Show
Ignore:
Timestamp:
07/28/07 02:43:03 (16 years ago)
Author:
ppalmers
Message:

Restructure the libavc directory in order to improve maintainability when
extending the implemented AV/C standards. The new directory structure is
a reflection of the specifications: the files in each directory (roughly)
correspond to the same specification.

The breakdown is:

general : AV/C Digital Interface Command Set General Specification
audiosubunit : Audio Subunit Specification
musicsubunit : Music Subunit Specification
ccm : Connection and Compatibility Management Specification
descriptors : AV/C Descriptor Mechanism Specification

util : Various utility classes (not from specs)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/echoaudio/src/bebob/bebob_avdevice.cpp

    r500 r502  
    2929#include "libieee1394/ieee1394service.h" 
    3030 
    31 #include "libavc/avc_plug_info.h" 
    32 #include "libavc/avc_extended_plug_info.h" 
    33 #include "libavc/avc_subunit_info.h" 
    34 #include "libavc/avc_extended_stream_format.h" 
    35 #include "libavc/avc_serialize.h" 
     31#include "libavc/general/avc_plug_info.h" 
     32#include "libavc/general/avc_extended_plug_info.h" 
     33#include "libavc/general/avc_subunit_info.h" 
     34#include "libavc/streamformat/avc_extended_stream_format.h" 
     35#include "libavc/util/avc_serialize.h" 
    3636#include "libavc/avc_definitions.h" 
    3737 

  • branches/echoaudio/src/bebob/bebob_avdevice.h

    r500 r502  
    2929#include "debugmodule/debugmodule.h" 
    3030#include "libavc/avc_definitions.h" 
    31 #include "libavc/avc_extended_cmd_generic.h" 
     31#include "libavc/general/avc_extended_cmd_generic.h" 
    3232 
    3333#include "bebob/bebob_avplug.h" 

  • branches/echoaudio/src/bebob/bebob_avdevice_subunit.cpp

    r499 r502  
    2828#include "libieee1394/configrom.h" 
    2929 
    30 #include "libavc/avc_plug_info.h" 
    31 #include "libavc/avc_extended_stream_format.h" 
    32 #include "libavc/avc_serialize.h" 
     30#include "libavc/general/avc_plug_info.h" 
     31#include "libavc/streamformat/avc_extended_stream_format.h" 
     32#include "libavc/util/avc_serialize.h" 
    3333 
    3434#include <sstream> 

  • branches/echoaudio/src/bebob/bebob_avdevice_subunit.h

    r499 r502  
    2929 
    3030#include "debugmodule/debugmodule.h" 
    31 #include "libavc/avc_extended_subunit_info.h" 
     31#include "libavc/general/avc_extended_subunit_info.h" 
    3232#include "libavc/avc_definitions.h" 
    33 #include "libavc/avc_generic.h" 
     33#include "libavc/general/avc_generic.h" 
    3434 
    3535#include <vector> 

  • branches/echoaudio/src/bebob/bebob_avplug.cpp

    r499 r502  
    2727 
    2828#include "libieee1394/ieee1394service.h" 
    29 #include "libavc/avc_serialize.h" 
     29#include "libavc/util/avc_serialize.h" 
    3030 
    3131#include <sstream> 

  • branches/echoaudio/src/bebob/bebob_avplug.h

    r499 r502  
    2525#define BEBOB_AVPLUG_H 
    2626 
    27 #include "libavc/avc_signal_source.h" 
    28 #include "libavc/avc_extended_stream_format.h" 
    29 #include "libavc/avc_extended_plug_info.h" 
    30 #include "libavc/avc_extended_cmd_generic.h" 
     27#include "libavc/ccm/avc_signal_source.h" 
     28#include "libavc/streamformat/avc_extended_stream_format.h" 
     29#include "libavc/general/avc_extended_plug_info.h" 
     30#include "libavc/general/avc_extended_cmd_generic.h" 
    3131#include "libavc/avc_definitions.h" 
    32 #include "libavc/avc_generic.h" 
     32#include "libavc/general/avc_generic.h" 
    3333 
    3434#include "libutil/serialize.h" 

  • branches/echoaudio/src/bebob/bebob_dl_codes.h

    r445 r502  
    2929#include "fbtypes.h" 
    3030 
    31 #include "libavc/avc_serialize.h" 
     31#include "libavc/util/avc_serialize.h" 
    3232 
    3333namespace BeBoB { 

  • branches/echoaudio/src/bebob/bebob_dl_mgr.cpp

    r445 r502  
    2929#include "libieee1394/ieee1394service.h" 
    3030 
    31 #include "libavc/avc_serialize.h" 
     31#include "libavc/util/avc_serialize.h" 
    3232 
    3333#include <netinet/in.h> 

  • branches/echoaudio/src/bebob/GenericMixer.cpp

    r462 r502  
    3131#include "libosc/OscResponse.h" 
    3232 
    33 #include "libavc/avc_function_block.h" 
    34 #include "libavc/avc_serialize.h" 
     33#include "libavc/audiosubunit/avc_function_block.h" 
     34#include "libavc/util/avc_serialize.h" 
    3535 
    3636#include "libieee1394/ieee1394service.h" 

  • branches/echoaudio/src/ffado.cpp

    r500 r502  
    3131#include "devicemanager.h" 
    3232#include "ffadodevice.h" 
    33  
    34 #include "libavc/avc_generic.h" 
    3533 
    3634#include <stdio.h> 
    …… 
    142140} 
    143141 
     142#warning this should be cleaned up 
     143#include "libavc/general/avc_generic.h" 
    144144void ffado_sleep_after_avc_command( int time ) 
    145145{ 

  • branches/echoaudio/src/libavc/audiosubunit/avc_function_block.cpp

    r455 r502  
    2424 
    2525#include "avc_function_block.h" 
    26 #include "avc_serialize.h" 
     26#include "../util/avc_serialize.h" 
    2727#include "libieee1394/ieee1394service.h" 
    2828 

  • branches/echoaudio/src/libavc/audiosubunit/avc_function_block.h

    r455 r502  
    2525#define AVCFUNCTIONBLOCK_H 
    2626 
    27 #include "avc_extended_cmd_generic.h" 
    28 #include "avc_generic.h" 
     27#include "../general/avc_extended_cmd_generic.h" 
     28#include "../general/avc_generic.h" 
    2929 
    3030#include <libavc1394/avc1394.h> 

  • branches/echoaudio/src/libavc/ccm/avc_signal_source.cpp

    r445 r502  
    2323 
    2424#include "avc_signal_source.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/ccm/avc_signal_source.h

    r445 r502  
    2525#define AVCSIGNALSOURCE_H 
    2626 
    27 #include "avc_generic.h" 
    28 #include "avc_definitions.h" 
     27#include "../general/avc_generic.h" 
     28#include "../avc_definitions.h" 
    2929 
    3030#include <libavc1394/avc1394.h> 

  • branches/echoaudio/src/libavc/descriptors/avc_descriptor.cpp

    r501 r502  
    2525#include "avc_descriptor_cmd.h" 
    2626 
    27 #include "avc_serialize.h" 
     27#include "../util/avc_serialize.h" 
    2828#include "libieee1394/ieee1394service.h" 
    2929 

  • branches/echoaudio/src/libavc/descriptors/avc_descriptor.h

    r501 r502  
    3636#define AVCDESCRIPTOR_H 
    3737 
    38 #include "avc_definitions.h" 
    39  
    40 #include "avc_generic.h" 
     38#include "../avc_definitions.h" 
     39 
     40#include "../general/avc_generic.h" 
    4141#include "debugmodule/debugmodule.h" 
    4242 

  • branches/echoaudio/src/libavc/descriptors/avc_descriptor_cmd.cpp

    r501 r502  
    2525#include "avc_descriptor_cmd.h" 
    2626#include "avc_descriptor.h" 
    27 #include "avc_serialize.h" 
     27#include "../util/avc_serialize.h" 
    2828#include "libieee1394/ieee1394service.h" 
    2929 

  • branches/echoaudio/src/libavc/descriptors/avc_descriptor_cmd.h

    r501 r502  
    2525#define AVCDESCRIPTORCMD_H 
    2626 
    27 #include "avc_generic.h" 
     27#include "../general/avc_generic.h" 
    2828 
    2929#include <libavc1394/avc1394.h> 

  • branches/echoaudio/src/libavc/general/avc_connect.cpp

    r445 r502  
    2323 
    2424#include "avc_connect.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_extended_cmd_generic.cpp

    r499 r502  
    2323 
    2424#include "avc_extended_cmd_generic.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_extended_plug_info.cpp

    r445 r502  
    2323 
    2424#include "avc_extended_plug_info.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_extended_subunit_info.cpp

    r445 r502  
    2323 
    2424#include "avc_extended_subunit_info.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_generic.cpp

    r499 r502  
    2323 
    2424#include "avc_generic.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_generic.h

    r499 r502  
    2525#define AVCGENERIC_H 
    2626 
    27 #include "avc_definitions.h" 
     27#include "../avc_definitions.h" 
    2828#include "debugmodule/debugmodule.h" 
    2929 
    30 #include "../fbtypes.h" 
     30#include "fbtypes.h" 
    3131 
    3232#include <libavc1394/avc1394.h> 

  • branches/echoaudio/src/libavc/general/avc_plug_info.cpp

    r499 r502  
    2323 
    2424#include "avc_plug_info.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_subunit_info.cpp

    r445 r502  
    2323 
    2424#include "avc_subunit_info.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/general/avc_unit_info.cpp

    r445 r502  
    2323 
    2424#include "avc_unit_info.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/musicsubunit/avc_descriptor_music.cpp

    r501 r502  
    2424#include "avc_descriptor_music.h" 
    2525 
    26 #include "avc_descriptor.h" 
    27 #include "avc_descriptor_cmd.h" 
    28  
    29 #include "avc_serialize.h" 
     26#include "../descriptors/avc_descriptor.h" 
     27#include "../descriptors/avc_descriptor_cmd.h" 
     28 
     29#include "../util/avc_serialize.h" 
    3030#include "libieee1394/ieee1394service.h" 
    3131 

  • branches/echoaudio/src/libavc/musicsubunit/avc_descriptor_music.h

    r501 r502  
    3030#define AVCDESCRIPTORMUSIC_H 
    3131 
    32 #include "avc_descriptor.h" 
    33 #include "avc_definitions.h" 
    34  
    35 #include "avc_generic.h" 
     32#include "../descriptors/avc_descriptor.h" 
     33#include "../avc_definitions.h" 
     34 
     35#include "../general/avc_generic.h" 
    3636#include "debugmodule/debugmodule.h" 
    3737 

  • branches/echoaudio/src/libavc/streamformat/avc_extended_stream_format.cpp

    r445 r502  
    2323 
    2424#include "avc_extended_stream_format.h" 
    25 #include "avc_serialize.h" 
     25#include "../util/avc_serialize.h" 
    2626#include "libieee1394/ieee1394service.h" 
    2727 

  • branches/echoaudio/src/libavc/streamformat/avc_extended_stream_format.h

    r445 r502  
    2525#define AVCEXTENDEDSTREAMFROMAT_H 
    2626 
    27 #include "avc_generic.h" 
    28 #include "avc_extended_cmd_generic.h" 
     27#include "../general/avc_generic.h" 
     28#include "../general/avc_extended_cmd_generic.h" 
    2929 
    3030#include <libavc1394/avc1394.h> 

  • branches/echoaudio/src/Makefile.am

    r500 r502  
    5656        metrichalo/mh_avdevice.h dice/dice_avdevice.h \ 
    5757        genericavc/avc_avdevice.h \ 
    58         libavc/avc_connect.h \ 
    59         libavc/avc_definitions.h libavc/avc_extended_cmd_generic.h \ 
    60         libavc/avc_extended_plug_info.h libavc/avc_extended_stream_format.h \ 
    61         libavc/avc_extended_subunit_info.h libavc/avc_function_block.h libavc/avc_generic.h \ 
    62         libavc/avc_plug_info.h libavc/avc_serialize.h libavc/avc_signal_source.h \ 
    63         libavc/avc_subunit_info.h libavc/avc_unit_info.h \ 
    64         libavc/avc_descriptor.h libavc/avc_descriptor_cmd.h libavc/avc_descriptor_music.h \ 
     58        libavc/streamformat/avc_extended_stream_format.h \ 
     59        libavc/util/avc_serialize.h \ 
     60        libavc/musicsubunit/avc_descriptor_music.h \ 
     61        libavc/descriptors/avc_descriptor_cmd.h \ 
     62        libavc/descriptors/avc_descriptor.h \ 
     63        libavc/general/avc_plug_info.h \ 
     64        libavc/general/avc_subunit_info.h \ 
     65        libavc/general/avc_extended_cmd_generic.h \ 
     66        libavc/general/avc_extended_subunit_info.h \ 
     67        libavc/general/avc_unit_info.h \ 
     68        libavc/general/avc_generic.h \ 
     69        libavc/general/avc_connect.h \ 
     70        libavc/general/avc_extended_plug_info.h \ 
     71        libavc/avc_definitions.h \ 
     72        libavc/ccm/avc_signal_source.h \ 
    6573        libosc/OscArgument.h libosc/OscNode.h libosc/OscResponse.h libosc/OscServer.h libosc/OscMessage.h \ 
    6674        libosc/OscClient.h \ 
    …… 
    8088# common sources 
    8189libffado_la_SOURCES = \ 
    82             devicemanager.cpp \ 
    83             ffado.cpp \ 
    84             ffado_streaming.cpp \ 
    85             ffadodevice.cpp \ 
    86             debugmodule/debugmodule.cpp \ 
    87             libavc/avc_connect.cpp \ 
    88             libavc/avc_definitions.cpp \ 
    89             libavc/avc_descriptor.cpp \ 
    90             libavc/avc_descriptor_cmd.cpp \ 
    91             libavc/avc_descriptor_music.cpp \ 
    92             libavc/avc_extended_cmd_generic.cpp \ 
    93             libavc/avc_extended_plug_info.cpp \ 
    94             libavc/avc_extended_stream_format.cpp \ 
    95             libavc/avc_extended_subunit_info.cpp \ 
    96             libavc/avc_function_block.cpp \ 
    97             libavc/avc_generic.cpp \ 
    98             libavc/avc_plug_info.cpp \ 
    99             libavc/avc_serialize.cpp \ 
    100             libavc/avc_signal_source.cpp \ 
    101             libavc/avc_subunit_info.cpp \ 
    102             libavc/avc_unit_info.cpp \ 
    103             libieee1394/ARMHandler.cpp \ 
    104             libieee1394/configrom.cpp \ 
    105             libieee1394/csr1212.c \ 
    106             libieee1394/ieee1394service.cpp \ 
    107             libieee1394/IEC61883.cpp \ 
    108             libosc/OscArgument.cpp \ 
    109             libosc/OscClient.cpp \ 
    110             libosc/OscMessage.cpp \ 
    111             libosc/OscNode.cpp \ 
    112             libosc/OscResponse.cpp \ 
    113             libosc/OscServer.cpp \ 
    114             libstreaming/cip.c \ 
    115             libstreaming/IsoHandler.cpp \ 
    116             libstreaming/IsoHandlerManager.cpp \ 
    117             libstreaming/IsoStream.cpp \ 
    118             libstreaming/Port.cpp \ 
    119             libstreaming/PortManager.cpp \ 
    120             libstreaming/StreamProcessor.cpp \ 
    121             libstreaming/StreamProcessorManager.cpp \ 
    122             libutil/DelayLockedLoop.cpp \ 
    123             libutil/PacketBuffer.cpp \ 
    124             libutil/OptionContainer.cpp \ 
    125             libutil/PosixThread.cpp \ 
    126             libutil/ringbuffer.c \ 
    127             libutil/serialize.cpp \ 
    128             libutil/StreamStatistics.cpp \ 
    129             libutil/SystemTimeSource.cpp \ 
    130             libutil/Time.c \ 
    131             libutil/TimeSource.cpp \ 
    132             libutil/TimestampedBuffer.cpp 
     90        devicemanager.cpp \ 
     91        ffado.cpp \ 
     92        ffado_streaming.cpp \ 
     93        ffadodevice.cpp \ 
     94        debugmodule/debugmodule.cpp \ 
     95        libavc/audiosubunit/avc_function_block.cpp \ 
     96        libavc/streamformat/avc_extended_stream_format.cpp \ 
     97        libavc/util/avc_serialize.cpp \ 
     98        libavc/musicsubunit/avc_descriptor_music.cpp \ 
     99        libavc/descriptors/avc_descriptor_cmd.cpp \ 
     100        libavc/descriptors/avc_descriptor.cpp \ 
     101        libavc/general/avc_extended_subunit_info.cpp \ 
     102        libavc/general/avc_unit_info.cpp \ 
     103        libavc/general/avc_generic.cpp \ 
     104        libavc/general/avc_subunit_info.cpp \ 
     105        libavc/general/avc_connect.cpp \ 
     106        libavc/general/avc_extended_cmd_generic.cpp \ 
     107        libavc/general/avc_extended_plug_info.cpp \ 
     108        libavc/general/avc_plug_info.cpp \ 
     109        libavc/avc_definitions.cpp \ 
     110        libavc/ccm/avc_signal_source.cpp \ 
     111        libieee1394/ARMHandler.cpp \ 
     112        libieee1394/configrom.cpp \ 
     113        libieee1394/csr1212.c \ 
     114        libieee1394/ieee1394service.cpp \ 
     115        libieee1394/IEC61883.cpp \ 
     116        libosc/OscArgument.cpp \ 
     117        libosc/OscClient.cpp \ 
     118        libosc/OscMessage.cpp \ 
     119        libosc/OscNode.cpp \ 
     120        libosc/OscResponse.cpp \ 
     121        libosc/OscServer.cpp \ 
     122        libstreaming/cip.c \ 
     123        libstreaming/IsoHandler.cpp \ 
     124        libstreaming/IsoHandlerManager.cpp \ 
     125        libstreaming/IsoStream.cpp \ 
     126        libstreaming/Port.cpp \ 
     127        libstreaming/PortManager.cpp \ 
     128        libstreaming/StreamProcessor.cpp \ 
     129        libstreaming/StreamProcessorManager.cpp \ 
     130        libutil/DelayLockedLoop.cpp \ 
     131        libutil/PacketBuffer.cpp \ 
     132        libutil/OptionContainer.cpp \ 
     133        libutil/PosixThread.cpp \ 
     134        libutil/ringbuffer.c \ 
     135        libutil/serialize.cpp \ 
     136        libutil/StreamStatistics.cpp \ 
     137        libutil/SystemTimeSource.cpp \ 
     138        libutil/Time.c \ 
     139        libutil/TimeSource.cpp \ 
     140        libutil/TimestampedBuffer.cpp 
    133141 
    134142# class specific sources 

  • branches/echoaudio/src/maudio/maudio_avdevice.h

    r500 r502  
    2828#include "debugmodule/debugmodule.h" 
    2929#include "libavc/avc_definitions.h" 
    30 #include "libavc/avc_extended_cmd_generic.h" 
     30#include "libavc/general/avc_extended_cmd_generic.h" 
    3131 
    3232#include "bebob/bebob_avdevice.h"