root/trunk/libfreebob/src/libfreebobavc/avc_definitions.h

Revision 151, 2.8 kB (checked in by wagi, 18 years ago)

2006-01-08 Daniel Wagner <wagi@monom.org>

  • src/avdevice.cpp (getModelName):
    Return model name and not vendor name.
    (getVendorName):
    Return vendor name and not model name.
    (discoverStep10Plug): Implementation added.
    (enumerateSubUnits): max_subunit_id removed.
    (addXmlDescription): Add stream format infos.
  • src/avdevice.h: discoverStep10 added.
    Renaming of addPlugToXmlDescription to addXmlDescriptionPlug.
    ESampleRate to ESamplingFrequency changes.
  • src/avplug.cpp (getSampleRate):
    Use convertESamplingFrequency instead of
    local implementation.
  • src/avplug.h:
    ESampleRate to ESamplingFrequency changes.
    Added FormatInfo? struct.
  • src/devicemanager.cpp (getXmlDescription):
    Print GUID correctly.
  • src/freebob.cpp (parseSampleRate):
    Moved to avc_definitions.cpp
  • src/libfreebobavc/avc_definitions.h
    src/libfreebobavc/avc_definitions.cpp:
    Renamed ESampleRate back to ESamlingFrequency.
    Added connvert functions for ESamplingFrequency.
  • configure.ac: New micro version.
  • Property svn:eol-style set to native
  • Property svn:keywords set to Author Date Id Revision
Line 
1 /* avc_definitions.h
2  * Copyright (C) 2005 by Daniel Wagner
3  *
4  * This file is part of FreeBob.
5  *
6  * FreeBob is free software; you can redistribute it and/or modify
7  * it under the terms of the GNU General Public License as published by
8  * the Free Software Foundation; either version 2 of the License, or
9  * (at your option) any later version.
10  * FreeBob is distributed in the hope that it will be useful,
11  * but WITHOUT ANY WARRANTY; without even the implied warranty of
12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13  * GNU General Public License for more details.
14  *
15  * You should have received a copy of the GNU General Public License
16  * along with FreeBob; if not, write to the Free Software
17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
18  * MA 02111-1307 USA.
19  */
20
21 #ifndef AVCDefinitions_h
22 #define AVCDefinitions_h
23
24 #include <libavc1394/avc1394.h>
25 #include <ostream>
26
27 typedef byte_t ctype_t;
28 typedef byte_t unit_t;
29 typedef byte_t unit_type_t;
30 typedef byte_t subunit_t;
31 typedef byte_t opcode_t;
32 typedef byte_t plug_type_t;
33 typedef byte_t plug_id_t;
34 typedef byte_t reserved_t;
35 typedef byte_t function_block_type_t;
36 typedef byte_t function_block_id_t;
37 typedef byte_t plug_direction_t;
38 typedef byte_t plug_address_mode_t;
39 typedef byte_t status_t;
40 typedef byte_t number_of_channels_t;
41 typedef byte_t stream_format_t;
42 typedef byte_t sampling_frequency_t;
43 typedef byte_t rate_control_t;
44 typedef byte_t number_of_stream_format_infos_t;
45 typedef byte_t nr_of_plugs_t;
46 typedef byte_t subunit_id_t;
47 typedef byte_t subfunction_t;
48 typedef byte_t opcode_t;
49 typedef byte_t page_t;
50 typedef byte_t extension_code_t;
51 typedef byte_t subunit_type_t;
52 typedef byte_t max_subunit_id_t;
53 typedef byte_t nr_of_channels_t;
54 typedef byte_t stream_position_t;
55 typedef byte_t stream_position_location_t;
56 typedef byte_t nr_of_clusters_t;
57 typedef byte_t string_length_t;
58 typedef byte_t cluster_index_t;
59 typedef byte_t port_type_t;
60 typedef byte_t number_of_output_plugs_t;
61
62 typedef quadlet_t company_id_t;
63
64 enum ESamplingFrequency {
65     eSF_22050Hz = 0x00,
66     eSF_24000Hz = 0x01,
67     eSF_32000Hz = 0x02,
68     eSF_44100Hz = 0x03,
69     eSF_48000Hz = 0x04,
70     eSF_88200Hz = 0x0A,
71     eSF_96000Hz = 0x05,
72     eSF_176400Hz = 0x06,
73     eSF_192000Hz = 0x07,
74     eSF_DontCare = 0x0F,
75 };
76
77 int convertESamplingFrequency(ESamplingFrequency freq);
78 ESamplingFrequency parseSampleRate( int sampleRate );
79
80 std::ostream& operator<<( std::ostream& stream, ESamplingFrequency samplingFrequency );
81
82 #define AVC1394_SUBUNIT_AUDIO 1
83 #define AVC1394_SUBUNIT_PRINTER 2
84 #define AVC1394_SUBUNIT_CA 6
85 #define AVC1394_SUBUNIT_PANEL 9
86 #define AVC1394_SUBUNIT_BULLETIN_BOARD 0xA
87 #define AVC1394_SUBUNIT_CAMERA_STORAGE 0xB
88 #define AVC1394_SUBUNIT_MUSIC 0xC
89 #define AVC1394_SUBUNIT_RESERVED 0x1D
90
91 #define AVC1394_SUBUNIT_ID_RESERVED 0x06
92
93 #endif // AVCDefinitions_h
Note: See TracBrowser for help on using the browser.