radio95/fm95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/fm95.git synced 2026-02-26 19:23:51 +01:00
Code Issues Activity

move constants.h and the oscillator into libfm from libfmdsp

Browse Source
This commit is contained in:
KubaPro010
2025-06-09 19:56:25 +02:00
parent 90e9925399
commit bcb9559d59
8 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -14,11 +14,11 @@ file(GLOB SRC_FILES "src/*.c")
file(GLOB DSP_FILES "dsp/*.c") file(GLOB DSP_FILES "dsp/*.c")
# file(GLOB LIB_FILES "lib/*.c") file(GLOB LIB_FILES "lib/*.c")
file(GLOB IO_FILES "io/*.c") file(GLOB IO_FILES "io/*.c")
# add_library(libfm OBJECT ${LIB_FILES}) add_library(libfm OBJECT ${LIB_FILES})
add_library(libfmdsp OBJECT ${DSP_FILES}) add_library(libfmdsp OBJECT ${DSP_FILES})
@@ -26,11 +26,12 @@ add_library(libfmio OBJECT ${IO_FILES})
# Define DEBUG macro for Debug builds on libraries # Define DEBUG macro for Debug builds on libraries
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(libfm PRIVATE DEBUG=1)
target_compile_definitions(libfmdsp PRIVATE DEBUG=1) target_compile_definitions(libfmdsp PRIVATE DEBUG=1)
target_compile_definitions(libfmio PRIVATE DEBUG=1) target_compile_definitions(libfmio PRIVATE DEBUG=1)
endif() endif()
set(FM_LIBS libfmio libfmdsp pulse pulse-simple m liquid) set(FM_LIBS libfm libfmio libfmdsp pulse pulse-simple m liquid)
foreach(SRC_FILE ${SRC_FILES}) foreach(SRC_FILE ${SRC_FILES})
get_filename_component(EXEC_NAME ${SRC_FILE} NAME_WE) get_filename_component(EXEC_NAME ${SRC_FILE} NAME_WE)

2
dsp/fm_modulator.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "oscillator.h" #include "../lib/oscillator.h"
typedef struct typedef struct
{ {

0
dsp/constants.h → lib/constants.h
View File

0
dsp/oscillator.c → lib/oscillator.c
View File

0
dsp/oscillator.h → lib/oscillator.h
View File

3
src/chimer95.c
View File

@@ -8,8 +8,7 @@
#define buffer_tlength_fragsize 1024 #define buffer_tlength_fragsize 1024
#define buffer_prebuf 0 #define buffer_prebuf 0
#include "../dsp/constants.h" #include "../lib/oscillator.h"
#include "../dsp/oscillator.h"
#include "../lib/optimization.h" #include "../lib/optimization.h"
#define DEFAULT_FREQ 1000.0f #define DEFAULT_FREQ 1000.0f

3
src/dcf95.c
View File

@@ -11,8 +11,7 @@
// #define DEBUG // #define DEBUG
#include "../dsp/constants.h" #include "../lib/oscillator.h"
#include "../dsp/oscillator.h"
#define DEFAULT_FREQ 77500.0f #define DEFAULT_FREQ 77500.0f
#define DEFAULT_SAMPLE_RATE 192000 #define DEFAULT_SAMPLE_RATE 192000

2
src/fm95.c
View File

@@ -20,7 +20,7 @@
#define DEFAULT_MPX_DEVIATION 75000.0f // for BS412 #define DEFAULT_MPX_DEVIATION 75000.0f // for BS412
#define DEFAULT_DEVIATION 75000.0f // another way to set the volume #define DEFAULT_DEVIATION 75000.0f // another way to set the volume
#include "../dsp/oscillator.h" #include "../lib/oscillator.h"
#include "../dsp/filters.h" #include "../dsp/filters.h"
#include "../dsp/fm_modulator.h" #include "../dsp/fm_modulator.h"
#include "../lib/optimization.h" #include "../lib/optimization.h"