Sound system improvements

.vscode/tasks.json

@@ -10,11 +10,14 @@
 				"-pipe",
 				"-flto",
 				"-fPIC",
+				"-DLIBBSD_OVERLAY",
+				"-I/usr/include/bsd",
 				"-g",
 				"*.c",
 				"-lncursesw",
 				"-lSDL2_mixer",
 				"-lSDL2",
+				"-lbsd",
 				"-o",
 				"${fileDirname}/main"
 			],

README.md

@@ -44,6 +44,8 @@ Below you can find compiling commands.
 
 ### -`sdl2_mixer`
 
+### -`libbsd`
+
 # To compile:
 
 ### $`make`

src/Makefile

@@ -7,8 +7,8 @@
 ##
 
 CC=gcc
-CLIBS=-lncursesw -lSDL2_mixer -lSDL2
-CFLAGS=-pipe -O2 -flto -Wall -Wextra -fPIC -std=gnu17
+LLIBS=-lncursesw -lSDL2_mixer -lSDL2 -lbsd
+CFLAGS=-pipe -O2 -flto -Wall -Wextra -fPIC -std=gnu17 -DLIBBSD_OVERLAY -I/usr/include/bsd
 
 OBJS= \
 	cmd.o \
@@ -18,14 +18,14 @@ OBJS= \
 	main.o \
 	menu.o \
 	screen.o \
-	sound.o 
+	sound.o
 
 default: all
 
 all: main
 
 main: $(OBJS)
-	$(CC) $(CFLAGS) -o vector $(OBJS) $(CLIBS)
+	$(CC) $(CFLAGS) -o vector $(OBJS) $(LLIBS)
 
 clean:
 	@rm -rf *.o vector
@@ -46,4 +46,4 @@ uninstall:
 	@sudo rm /usr/share/icons/logo.png
 	@sudo rm /usr/share/applications/vector.desktop
 	@sudo rm ~/.config/vector/ -r
-	@sudo rm /opt/vector/ -r
+	@sudo rm /opt/vector/ -r

src/cmd.c

@@ -1,8 +1,9 @@
 //
-// cmd.c
-// Vector
+// cmd.c -- Terminal Arguments
 //
-// Created by Aarch-64 on 18/12/2022.
+// This file is owned by the vector project
+//
+// Created by Aarch-64 on 18/12/2022
 // Copyright (C) 2022 Agustín Gutíerrez. All rights reserved.
 //
 
@@ -45,12 +46,12 @@ void extended(void)
 /* CLI arguments */
 void cmd(int argc, char *argv[])
 {
-    if (argc == 2)
+    if (argc > 1)
     { 
         /* if (argument cmd 1) == argv_help */
         if (!strcmp(argv[1], argv_help) || !strcmp(argv[1], argv_hel)) // || if (argument cmd 1) == argv_hel...
         { 
-            printf("--version\t\t\tProgram version\n");
+            puts("--version\t\t\tProgram version\n");
             exit(EXIT_SUCCESS);
         } 
 
@@ -61,5 +62,10 @@ void cmd(int argc, char *argv[])
             extended();
             exit(EXIT_SUCCESS);
         }
+        else
+        {
+            puts("invalid argument\n");
+            exit(EXIT_FAILURE);
+        }
     }
-}
+}

src/files.c

@@ -95,7 +95,7 @@ unsigned short int LoadOptions(OPTION *O)
 
     if (O->mstate)                          // music initializator
     {
-        sound(SONG1, SOUNDFREQ, SOUNDBUFLEN);
+        sound(music_ini, SOUNDFREQ, SOUNDBUFLEN);
     }
 
     return 0;
@@ -190,4 +190,4 @@ void saveScore(PLAYER P, int score)
         fprintf(fPtr, "%s score: %d\n", P.name, score);  // reading PLAYER structure
 
     fclose(fPtr);                           // closing save file
-}
+}

src/game.c

@@ -75,7 +75,7 @@ long int start()
     clear_s(); // clear screen
 
     if (O.mstate)
-        sound(SONG2, SOUNDFREQ, SOUNDBUFLEN); // start music
+        sound(music_game, SOUNDFREQ, SOUNDBUFLEN); // start music
 
     // setting colors
     init_pair(1, P.cstate, COLOR_BLACK);      // user's choice text on black background
@@ -231,7 +231,7 @@ long int start()
             if (O.mstate)
             {
                 cleansound();
-                wsound(SONG3, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
+                wsound(music_game_over, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
                 sleep(1);
                 cleansound();   // closing vlc
             }
@@ -250,7 +250,7 @@ long int start()
             if (O.mstate)
             {
                 cleansound();
-                wsound(SONG3, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
+                wsound(music_game_over, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
                 sleep(1);
                 cleansound();   // closing vlc
             }
@@ -269,9 +269,9 @@ long int start()
             if (O.mstate)
             {
                 cleansound();
-                wsound(SONG3, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
+                wsound(music_game_over, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
                 sleep(1);
-                cleansound();   // closing vlc
+                cleansound();   // closing sdl
             }
             sleep(2);
 
@@ -303,8 +303,8 @@ long int start()
 
     if (O.mstate)
     {
-        cleansound();   // closing vlc
-        sound(SONG1, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
+        cleansound();   // closing sdl
+        sound(music_ini, SOUNDFREQ, SOUNDBUFLEN); // starting main menu music
     }
 
     // restoring default screen options
@@ -318,4 +318,4 @@ long int start()
     //     score = 0;
 
     return score;
-}
+}

src/include/cmd.h

@@ -1,6 +1,6 @@
 // DEFINE FOR CLI ARGUMENTS
 #define PROJNAME "Vector"
-#define DISTVERSION "1.1.1"
+#define DISTVERSION "1.1.2"
 #define BUILDVERSION 1
 #define RELSTATUS "release"
 #define BUILDPTFORM "x86_64-pc-linux-gnu"

src/include/sound.h

@@ -7,15 +7,29 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <ncurses.h>
+#include <stdbool.h>
+#include <string.h>
+#include <syslog.h>
 
-#define SONG1 "/opt/vector/music/menusound.xm"
-#define SONG2 "/opt/vector/music/gamesound.mp3"
-#define SONG3 "/opt/vector/music/gameover.wav"
+// #define SONG1 "SelfControl.mp3"
+// #define SONG2 "Vitality_-_Electro_Shock_Sport_Dance.ogg"
+
+#define SONG1 "menusound.xm"
+#define SONG2 "gamesound.mp3"
+#define SONG3 "gameover.wav"
 
 #define MAXCHAN 32
 #define SOUNDFREQ 44100
-#define SOUNDBUFLEN 1024
-                                                             //       music.mp3, 44100, 1024
+#define SOUNDBUFLEN 2048    
+
+extern char out_sound_dir[70];
+extern char music_ini[70];
+extern char music_game[70];
+extern char music_game_over[70];     
+
+extern bool nosound;
+
+            //       music.mp3, 44100, 1024
 void sound(void *sound, int sound_freq, int soundbufferlen); // sound(SONG1, SOUNDFREQ, SOUNDBUFFLEN);
 void wsound(void *sound, int sound_freq, int soundbufferlen);
 void stop_sound(void *sound); // stop_sound(SONG1);

src/main.c

@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 
         if (O.mstate)
         {
-            sound(SONG1, SOUNDFREQ, SOUNDBUFLEN);
+            sound(music_ini, SOUNDFREQ, SOUNDBUFLEN);
         }
     }
 
@@ -122,4 +122,4 @@ int main(int argc, char *argv[])
 
     exit_s();
     exit(EXIT_SUCCESS);
-}
+}

src/menu.c

@@ -89,7 +89,7 @@ void setmusic(OPTION *O)
 
             sprint("Music On\n");
 
-            sound(SONG1, SOUNDFREQ, SOUNDBUFLEN);
+            sound(music_ini, SOUNDFREQ, SOUNDBUFLEN);
         }
 
         else
@@ -208,4 +208,4 @@ void controls()
 
     setbuf(stdin, NULL);
     getchar();
-}
+}