Changeset fe0b448 in mainline

Timestamp:

2013-03-17T13:54:01Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

059490c2

Parents:

36774cf

Message:

libpcm: Move constant definitions to .c file

Location:

uspace/lib/pcm

Files:

• include/pcm/format.h (modified) (1 diff)
• src/format.c (modified) (1 diff)

uspace/lib/pcm/include/pcm/format.h

@@ -47 +47 @@
 } pcm_format_t;
 
-static const pcm_format_t AUDIO_FORMAT_DEFAULT = {
-        .channels = 2,
-        .sampling_rate = 44100,
-        .sample_format = PCM_SAMPLE_SINT16_LE,
-        };
-
-static const pcm_format_t AUDIO_FORMAT_ANY = {
-        .channels = 0,
-        .sampling_rate = 0,
-        .sample_format = 0,
-        };
+extern const pcm_format_t AUDIO_FORMAT_DEFAULT;
+extern const pcm_format_t AUDIO_FORMAT_ANY;
 
 static inline size_t pcm_format_frame_size(const pcm_format_t *a)

uspace/lib/pcm/src/format.c

@@ -74 +74 @@
 #define from(x, type, endian) (float)(type ## _ ## endian ## 2host(x))
 #define to(x, type, endian) (float)(host2 ## type ## _ ## endian(x))
+
+const pcm_format_t AUDIO_FORMAT_DEFAULT = {
+        .channels = 2,
+        .sampling_rate = 44100,
+        .sample_format = PCM_SAMPLE_SINT16_LE,
+        };
+
+const pcm_format_t AUDIO_FORMAT_ANY = {
+        .channels = 0,
+        .sampling_rate = 0,
+        .sample_format = 0,
+        };
 
 static float get_normalized_sample(const void *buffer, size_t size,