moved all C headers to same headers/ dir

moved all c headers to same headers/ dir and specified the install dependencies and process.
suchinton · Jul 5, 2022 · 8fbfe65 · 8fbfe65
1 parent 531685c
commit 8fbfe65
Show file tree

Hide file tree

Showing 39 changed files with 71 additions and 36 deletions.
diff --git a/MusicID.py b/MusicID.py
@@ -263,6 +263,13 @@ def run(self):
 
 # init the app
 if __name__ == '__main__':
+
+    if os.path.exists("./lib/musicID"):
+        print("no need to make file again")
+    else:
+        os.system("cd lib && make")
+        os.system("bash install_dependencies.sh")
+
     app = QApplication(sys.argv)
     Main_pg = MainWindow()
     sys.exit(app.exec())
diff --git a/install_dependencies.sh b/install_dependencies.sh
@@ -0,0 +1,13 @@
+#!/bin/sh env
+
+sudo pacman -S python-pip
+yay -Syu chromium-widevine
+pip3 install -r requirements.txt
+
+#pip3 install PyQt5
+#pip3 install PyQt5-tools
+#pip3 insatll QWebEngineView
+#pip3 install pyaudio
+#pip3 insatll wave
+#pip3 insatll spotipy
+#pip3 install PyQt5-stubs
diff --git a/lib/audionormalizer.c b/lib/audionormalizer.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include "audionormalizer.h"
+#include "headers/audionormalizer.h"
 
 
 void normalize(float* samples, unsigned int size) {

diff --git a/lib/ffmpeg.c b/lib/ffmpeg.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include "ffmpeg.h"
+#include "headers/ffmpeg.h"
 
 
 static void parse_metadata(char* metadata, char* *artist, char* *track_title, char* *album_title) {

diff --git a/lib/fft.c b/lib/fft.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include "fft.h"
+#include "headers/fft.h"
 
 static uint16_t reversed[2048] = { 0xFFFF };
 

diff --git a/lib/fingerprinting.c b/lib/fingerprinting.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "fingerprinting.h"
-#include "haar.h"
-#include "minhash.h"
-#include "rawfingerprints.h"
-#include "spectralimages.h"
-#include "wav.h"
+#include "headers/fingerprinting.h"
+#include "headers/haar.h"
+#include "headers/minhash.h"
+#include "headers/rawfingerprints.h"
+#include "headers/spectralimages.h"
+#include "headers/wav.h"
 
 int generate_fingerprint(const char* wav, struct signatures* *fingerprint,
                             char* *artist, char* *track_title, char* *album_title) {
-    // Let's make sure we have a wave file we can read
+    //  making sure we have a wave file we can read
     struct wav_reader* reader;
     int res = new_wav_reader(wav, &reader);
     if (res != SUCCESS) {
@@ -26,15 +26,15 @@ int generate_fingerprint(const char* wav, struct signatures* *fingerprint,
         fprintf(stderr, "Album title: %s\n", reader->album_title);
     }
 
-    // Let's steal the metadata from the wav reader
+    // extracting the metadata from the wav reader
     if (artist != NULL) *artist = reader->artist;
     if (track_title != NULL) *track_title = reader->track_title;
     if (album_title != NULL) *album_title = reader->album_title;
     reader->artist = NULL;
     reader->track_title = NULL;
     reader->album_title = NULL;
 
-    // Let's downsample the file into 5512Hz mono float samples between -1.0 and 1.0
+    // downsampling the file into 5512Hz mono float samples between -1.0 and 1.0
     float* samples;
     int n = read_samples(reader, &samples);
     free_wav_reader(reader);

diff --git a/lib/fingerprintio.c b/lib/fingerprintio.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "fingerprintio.h"
+#include "headers/fingerprintio.h"
 
 
 static void free_index_entry(struct index_entry* entry);

diff --git a/lib/generatepermutations.c b/lib/generatepermutations.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "permutations.h"
+#include "headers/permutations.h"
 
 // A very important part of the audiofingerprinting process is the MinHash algorithm
 // used to shorten the many signatures generated for each audio input. This process

diff --git a/lib/haar.c b/lib/haar.c
@@ -2,7 +2,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "haar.h"
+#include "headers/haar.h"
 
 #define N_THREADS 8
 

diff --git a/lib/hannwindow.c b/lib/hannwindow.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include "hannwindow.h"
+#include "headers/hannwindow.h"
 
 
 static float window[SAMPLES_PER_FRAME] = { 666 };

diff --git a/lib/audionormalizer.h → lib/headers/audionormalizer.h b/lib/audionormalizer.h → lib/headers/audionormalizer.h
diff --git a/lib/errors.h → lib/headers/errors.h b/lib/errors.h → lib/headers/errors.h
diff --git a/lib/ffmpeg.h → lib/headers/ffmpeg.h b/lib/ffmpeg.h → lib/headers/ffmpeg.h
diff --git a/lib/fft.h → lib/headers/fft.h b/lib/fft.h → lib/headers/fft.h
diff --git a/lib/fingerprinting.h → lib/headers/fingerprinting.h b/lib/fingerprinting.h → lib/headers/fingerprinting.h
diff --git a/lib/fingerprintio.h → lib/headers/fingerprintio.h b/lib/fingerprintio.h → lib/headers/fingerprintio.h
diff --git a/lib/haar.h → lib/headers/haar.h b/lib/haar.h → lib/headers/haar.h
diff --git a/lib/hannwindow.h → lib/headers/hannwindow.h b/lib/hannwindow.h → lib/headers/hannwindow.h
diff --git a/lib/logbins.h → lib/headers/logbins.h b/lib/logbins.h → lib/headers/logbins.h
diff --git a/lib/lsh.h → lib/headers/lsh.h b/lib/lsh.h → lib/headers/lsh.h
diff --git a/lib/minhash.h → lib/headers/minhash.h b/lib/minhash.h → lib/headers/minhash.h
diff --git a/lib/permutations.h → lib/headers/permutations.h b/lib/permutations.h → lib/headers/permutations.h
diff --git a/lib/rawfingerprints.h → lib/headers/rawfingerprints.h b/lib/rawfingerprints.h → lib/headers/rawfingerprints.h
diff --git a/lib/resample.h → lib/headers/resample.h b/lib/resample.h → lib/headers/resample.h
diff --git a/lib/search.h → lib/headers/search.h b/lib/search.h → lib/headers/search.h
diff --git a/lib/spectralimages.h → lib/headers/spectralimages.h b/lib/spectralimages.h → lib/headers/spectralimages.h
diff --git a/lib/wav.h → lib/headers/wav.h b/lib/wav.h → lib/headers/wav.h
diff --git a/lib/logbins.c b/lib/logbins.c
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "logbins.h"
+#include "headers/logbins.h"
 
 #define MINIMUM_FREQUENCY 318
 #define MAXIMUM_FREQUENCY 2000

diff --git a/lib/lsh.c b/lib/lsh.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "lsh.h"
+#include "headers/lsh.h"
 
 
 void free_signature_list(struct signature_list* list) {

diff --git a/lib/main.c b/lib/main.c
@@ -3,11 +3,11 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "ffmpeg.h"
-#include "fingerprinting.h"
-#include "fingerprintio.h"
-#include "lsh.h"
-#include "search.h"
+#include "headers/ffmpeg.h"
+#include "headers/fingerprinting.h"
+#include "headers/fingerprintio.h"
+#include "headers/lsh.h"
+#include "headers/search.h"
 
 static long time_in_milliseconds() {
     struct timeval tv;

diff --git a/lib/minhash.c b/lib/minhash.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
-#include "minhash.h"
-#include "permutations.h"
+#include "headers/minhash.h"
+#include "headers/permutations.h"
 
 
 /**

diff --git a/lib/permutations.c b/lib/permutations.c
@@ -2,7 +2,7 @@
  * This file was generated by compiling and running generatepermutations.c
  */
 
-#include "permutations.h"
+#include "headers/permutations.h"
 
 static uint16_t permutations[N_PERMUTATIONS][PERMUTATION_LENGTH] = {
    {

diff --git a/lib/rawfingerprints.c b/lib/rawfingerprints.c
@@ -2,7 +2,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "rawfingerprints.h"
+#include "headers/rawfingerprints.h"
 
 
 #define N_THREADS 8

diff --git a/lib/resample.c b/lib/resample.c
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "resample.h"
+#include "headers/resample.h"
 
 
 #define FILTER_SIZE 31

diff --git a/lib/search.c b/lib/search.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "lsh.h"
-#include "search.h"
+#include "headers/lsh.h"
+#include "headers/search.h"
 
 
 // Checking hashes by buckets of 4 bytes is meant to

diff --git a/lib/spectralimages.c b/lib/spectralimages.c
@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "fft.h"
-#include "hannwindow.h"
-#include "spectralimages.h"
+#include "headers/fft.h"
+#include "headers/hannwindow.h"
+#include "headers/spectralimages.h"
 
 
 #define N_THREADS 8

diff --git a/lib/wav.c b/lib/wav.c
@@ -2,9 +2,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "audionormalizer.h"
-#include "resample.h"
-#include "wav.h"
+#include "headers/audionormalizer.h"
+#include "headers/resample.h"
+#include "headers/wav.h"
 
 
 // Uncompressed integer PCM

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,8 @@
+PyQt5              >= 5.15.7
+PyQt5-sip          >= 12.11.0
+PyQt5-stubs        >= 5.15.6.0
+PyQtWebEngine      >= 5.15.6
+PyQtWebEngine-Qt5  >= 5.15.2
+PyAudio            >= 0.2.11
+Wave               >= 0.0.2
+spotipy            >= 2.20.0
diff --git a/spotiFind.py b/spotiFind.py
@@ -2,6 +2,13 @@
 from spotipy.oauth2 import SpotifyClientCredentials
 from SPT_C import SPOTIPY_CLIENT_ID, SPOTIPY_CLIENT_SECRET
 
+#get client id and secret from the link given below
+#https://developer.spotify.com/dashboard/login
+# and save them in SPT_C.py in the main directory i.e. ./MusicID/
+#
+#SPOTIPY_CLIENT_ID=''
+#SPOTIPY_CLIENT_SECRET=''
+
 def Spoti_Find(string):
     auth_manager = SpotifyClientCredentials(client_id=SPOTIPY_CLIENT_ID, client_secret=SPOTIPY_CLIENT_SECRET)
     sp = spotipy.Spotify(auth_manager=auth_manager)