Skip to content

Commit c3957c2

Browse files
LukashonakVLukashonakV
committed
cava folders structure reorganization
1 parent 7b9d8c3 commit c3957c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+277
-330
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
run: ./configure
2525
- name: Run make
2626
run: make CFLAGS='-Werror'
27-
- name: Run make distcheck
28-
run: make distcheck
27+
#temporary disabled
28+
# - name: Run make distcheck
29+
# run: make distcheck
2930
- name: Prepare tests
3031
run: |
3132
pulseaudio -D

‎CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (ANDROID)
1717
if (NOT EXISTS "${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/")
1818
message(FATAL_ERROR "given lib dir: ${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/ does not exist, did you build it? See cavandroid/README.md")
1919
endif()
20-
target_include_directories(cavacore PRIVATE "${FFTW_DIR}/jni/fftw3/api/")
20+
target_include_directories(cavacore PRIVATE "${FFTW_DIR}/jni/fftw3/api/" include)
2121
target_link_directories(cavacore PRIVATE "${FFTW_DIR}/obj/local/${CMAKE_ANDROID_ARCH_ABI}/")
2222
target_link_libraries(cavacore fftw3)
2323
elseif(WIN32)
@@ -27,21 +27,21 @@ elseif(WIN32)
2727
find_package(Threads)
2828

2929
add_executable(cava
30-
cava.c
31-
cavacore.c
32-
config.c
33-
input/common.c
34-
input/winscap.c
35-
output/sdl_cava.c
36-
output/sdl_glsl.c
37-
output/terminal_noncurses.c
38-
output/raw.c
39-
output/noritake.c
30+
src/cava.c
31+
src/cavacore.c
32+
src/config.c
33+
src/input/common.c
34+
src/input/winscap.c
35+
src/output/sdl_cava.c
36+
src/output/sdl_glsl.c
37+
src/output/terminal_noncurses.c
38+
src/output/raw.c
39+
src/output/noritake.c
4040
cava_win/cava/cava.rc
4141
)
4242

4343
target_compile_definitions(cava PRIVATE SDL SDL_GSL NDEBUG)
44-
target_include_directories(cava PRIVATE ${GLEW_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS})
44+
target_include_directories(cava PRIVATE ${GLEW_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS} include)
4545
target_link_libraries(cava PRIVATE pthread shlwapi fftw3 GLEW::GLEW SDL2::SDL2)
4646
else()
4747
add_library(cavacore STATIC cavacore.c)

‎Makefile.am‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,24 @@ ACLOCAL_AMFLAGS = -I m4
44

55
bin_PROGRAMS = cava
66
cavadir = $(top_srcdir)
7-
cava_SOURCES = cava.c cavacore.c config.c input/common.c input/fifo.c input/shmem.c \
8-
output/terminal_noncurses.c output/raw.c output/noritake.c \
9-
cavacore.h config.h input/common.h input/fifo.h input/shmem.h \
10-
output/terminal_noncurses.h output/raw.h output/noritake.h \
11-
debug.h util.h third_party/incbin.h
7+
cava_SOURCES = src/cava.c src/cavacore.c src/config.c src/input/common.c \
8+
src/input/fifo.c src/input/shmem.c src/output/terminal_noncurses.c \
9+
src/output/raw.c src/output/noritake.c include/third_party/incbin.h
1210
cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
1311
-D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED \
14-
-DFONTDIR=\"@FONT_DIR@\" -DFONTFILE=\"@FONT_FILE@\"
12+
-DFONTDIR=\"@FONT_DIR@\" -DFONTFILE=\"@FONT_FILE@\" \
13+
-I$(top_builddir) -I$(top_builddir)/include
1514
cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-vla-parameter
1615

1716
EXTRA_DIST = \
18-
output/shaders/pass_through.vert \
19-
output/shaders/bar_spectrum.frag \
20-
output/shaders/northern_lights.frag \
21-
output/shaders/winamp_line_style_spectrum.frag \
22-
output/shaders/spectrogram.frag \
23-
output/shaders/eye_of_phi.frag \
24-
output/themes/solarized_dark \
25-
output/themes/tricolor \
17+
src/output/shaders/pass_through.vert \
18+
src/output/shaders/bar_spectrum.frag \
19+
src/output/shaders/northern_lights.frag \
20+
src/output/shaders/winamp_line_style_spectrum.frag \
21+
src/output/shaders/spectrogram.frag \
22+
src/output/shaders/eye_of_phi.frag \
23+
src/output/themes/solarized_dark \
24+
src/output/themes/tricolor \
2625
example_files/config \
2726
cava.psf \
2827
LICENSE \
@@ -51,43 +50,43 @@ endif
5150
endif
5251

5352
if ALSA
54-
cava_SOURCES += input/alsa.c input/alsa.h
53+
cava_SOURCES += src/input/alsa.c
5554
endif
5655

5756
if PORTAUDIO
58-
cava_SOURCES += input/portaudio.c input/portaudio.h
57+
cava_SOURCES += src/input/portaudio.c
5958
endif
6059

6160
if PIPEWIRE
62-
cava_SOURCES += input/pipewire.c input/pipewire.h
61+
cava_SOURCES += src/input/pipewire.c
6362
endif
6463

6564
if PULSE
66-
cava_SOURCES += input/pulse.c input/pulse.h
65+
cava_SOURCES += src/input/pulse.c
6766
endif
6867

6968
if SNDIO
70-
cava_SOURCES += input/sndio.c input/sndio.h
69+
cava_SOURCES += src/input/sndio.c
7170
endif
7271

7372
if OSS
74-
cava_SOURCES += input/oss.c input/oss.h
73+
cava_SOURCES += src/input/oss.c
7574
endif
7675

7776
if JACK
78-
cava_SOURCES += input/jack.c input/jack.h
77+
cava_SOURCES += src/input/jack.c
7978
endif
8079

8180
if NCURSES
82-
cava_SOURCES += output/terminal_ncurses.c output/terminal_bcircle.c \
83-
output/terminal_ncurses.h output/terminal_bcircle.h
81+
cava_SOURCES += src/output/terminal_ncurses.c \
82+
src/output/terminal_bcircle.c
8483

8584
endif
8685

8786
if SDL
88-
cava_SOURCES += output/sdl_cava.c output/sdl_cava.h
87+
cava_SOURCES += src/output/sdl_cava.c
8988
endif
9089

9190
if SDL_GLSL
92-
cava_SOURCES += output/sdl_glsl.c output/sdl_glsl.h
91+
cava_SOURCES += src/output/sdl_glsl.c
9392
endif

‎cava_win/cava/cava.rc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313

1414
IDR_CONFIG_FILE TEXTFILE "../../example_files/config"
15-
IDR_BAR_SPECTRUM_SHADER TEXTFILE "../../output/shaders/bar_spectrum.frag"
16-
IDR_NORTHERN_LIGHTS_SHADER TEXTFILE "../../output/shaders/northern_lights.frag"
17-
IDR_PASS_THROUGH_SHADER TEXTFILE "../../output/shaders/pass_through.vert"
18-
IDR_SPECTROGRAM_SHADER TEXTFILE "../../output/shaders/spectrogram.frag"
19-
IDR_WINAMP_LINE_STYLE_SPECTRUM_SHADER TEXTFILE "../../output/shaders/winamp_line_style_spectrum.frag"
20-
IDR_EYE_OF_PHI_SHADER TEXTFILE "../../output/shaders/eye_of_phi.frag"
15+
IDR_BAR_SPECTRUM_SHADER TEXTFILE "../../src/output/shaders/bar_spectrum.frag"
16+
IDR_NORTHERN_LIGHTS_SHADER TEXTFILE "../../src/output/shaders/northern_lights.frag"
17+
IDR_PASS_THROUGH_SHADER TEXTFILE "../../src/output/shaders/pass_through.vert"
18+
IDR_SPECTROGRAM_SHADER TEXTFILE "../../src/output/shaders/spectrogram.frag"
19+
IDR_WINAMP_LINE_STYLE_SPECTRUM_SHADER TEXTFILE "../../src/output/shaders/winamp_line_style_spectrum.frag"
20+
IDR_EYE_OF_PHI_SHADER TEXTFILE "../../src/output/shaders/eye_of_phi.frag"
2121

22-
IDR_SOLARIZED_DARK_THEME TEXTFILE "../../output/themes/solarized_dark"
23-
IDR_TRICOLOR_THEME TEXTFILE "../../output/themes/tricolor"
22+
IDR_SOLARIZED_DARK_THEME TEXTFILE "../../src/output/themes/solarized_dark"
23+
IDR_TRICOLOR_THEME TEXTFILE "../../src/output/themes/tricolor"

‎cava_win/cava/cava.vcxproj‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<SDLCheck>true</SDLCheck>
119119
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);SDL;SDL_GLSL;_CRT_SECURE_NO_WARNINGS;_TIMESPEC_DEFINED;NDEBUG</PreprocessorDefinitions>
120120
<ConformanceMode>true</ConformanceMode>
121-
<AdditionalIncludeDirectories>$(SolutionDir)..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121+
<AdditionalIncludeDirectories>$(SolutionDir)..\;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122122
</ClCompile>
123123
<Link>
124124
<SubSystem>Console</SubSystem>
@@ -151,7 +151,7 @@
151151
<SDLCheck>true</SDLCheck>
152152
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);SDL;SDL_GLSL;_CRT_SECURE_NO_WARNINGS;_TIMESPEC_DEFINED;NDEBUG</PreprocessorDefinitions>
153153
<ConformanceMode>true</ConformanceMode>
154-
<AdditionalIncludeDirectories>$(SolutionDir)..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
154+
<AdditionalIncludeDirectories>$(SolutionDir)..\;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155155
</ClCompile>
156156
<Link>
157157
<SubSystem>Console</SubSystem>
@@ -177,29 +177,29 @@
177177
</PostBuildEvent>
178178
</ItemDefinitionGroup>
179179
<ItemGroup>
180-
<ClCompile Include="..\..\cava.c" />
181-
<ClCompile Include="..\..\cavacore.c" />
182-
<ClCompile Include="..\..\config.c" />
183-
<ClCompile Include="..\..\input\common.c" />
184-
<ClCompile Include="..\..\input\winscap.c" />
185-
<ClCompile Include="..\..\output\sdl_cava.c" />
186-
<ClCompile Include="..\..\output\sdl_glsl.c" />
187-
<ClCompile Include="..\..\output\terminal_noncurses.c" />
188-
<ClCompile Include="..\..\output\raw.c" />
189-
<ClCompile Include="..\..\output\noritake.c" />
180+
<ClCompile Include="..\..\src\cava.c" />
181+
<ClCompile Include="..\..\src\cavacore.c" />
182+
<ClCompile Include="..\..\src\config.c" />
183+
<ClCompile Include="..\..\src\input\common.c" />
184+
<ClCompile Include="..\..\src\input\winscap.c" />
185+
<ClCompile Include="..\..\src\output\sdl_cava.c" />
186+
<ClCompile Include="..\..\src\output\sdl_glsl.c" />
187+
<ClCompile Include="..\..\src\output\terminal_noncurses.c" />
188+
<ClCompile Include="..\..\src\output\raw.c" />
189+
<ClCompile Include="..\..\src\output\noritake.c" />
190190
</ItemGroup>
191191
<ItemGroup>
192-
<ClInclude Include="..\..\cavacore.h" />
193-
<ClInclude Include="..\..\config.h" />
194-
<ClInclude Include="..\..\debug.h" />
195-
<ClInclude Include="..\..\input\common.h" />
196-
<ClInclude Include="..\..\input\winscap.h" />
197-
<ClInclude Include="..\..\output\sdl_cava.h" />
198-
<ClInclude Include="..\..\output\sdl_glsl.h" />
199-
<ClInclude Include="..\..\output\terminal_noncurses.h" />
200-
<ClInclude Include="..\..\output\raw.h" />
201-
<ClInclude Include="..\..\output\noritake.h" />
202-
<ClInclude Include="..\..\util.h" />
192+
<ClInclude Include="..\..\include\cava\cavacore.h" />
193+
<ClInclude Include="..\..\include\cava\config.h" />
194+
<ClInclude Include="..\..\include\cava\debug.h" />
195+
<ClInclude Include="..\..\include\cava\input\common.h" />
196+
<ClInclude Include="..\..\include\cava\input\winscap.h" />
197+
<ClInclude Include="..\..\include\cava\output\sdl_cava.h" />
198+
<ClInclude Include="..\..\include\cava\output\sdl_glsl.h" />
199+
<ClInclude Include="..\..\include\cava\output\terminal_noncurses.h" />
200+
<ClInclude Include="..\..\include\cava\output\raw.h" />
201+
<ClInclude Include="..\..\include\cava\output\noritake.h" />
202+
<ClInclude Include="..\..\include\cava\util.h" />
203203
</ItemGroup>
204204
<ItemGroup>
205205
<None Include="packages.config" />
@@ -229,4 +229,4 @@
229229
<Error Condition="!Exists('..\packages\glew.1.9.0.1\build\native\glew.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glew.1.9.0.1\build\native\glew.targets'))" />
230230
<Error Condition="!Exists('..\packages\fftw_339.3.3.9.202108273\build\native\fftw_339.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\fftw_339.3.3.9.202108273\build\native\fftw_339.targets'))" />
231231
</Target>
232-
</Project>
232+
</Project>

cavacore.h renamed to include/cava/cavacore.h

File renamed without changes.

config.h renamed to include/cava/config.h

File renamed without changes.

debug.h renamed to include/cava/debug.h

File renamed without changes.

input/alsa.h renamed to include/cava/input/alsa.h

File renamed without changes.

input/common.h renamed to include/cava/input/common.h

File renamed without changes.

0 commit comments

Comments
 (0)