-
-
Save cleverca22/7bcbc5bbf8ab7bfc6ef2f6b67ebff884 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Only in jackmaster-0.0.2-new/: ac_cfg.h | |
Only in jackmaster-0.0.2-new/: CMakeLists.txt | |
Only in jackmaster-0.0.2-new/src: .gtkhelper.c.swp | |
Only in jackmaster-0.0.2-new/src: .gtkhelper.h.swp | |
Only in jackmaster-0.0.2-new/src: .jack_if.c.swp | |
diff -r -u jackmaster-0.0.2/src/jack_process.c jackmaster-0.0.2-new/src/jack_process.c | |
--- jackmaster-0.0.2/src/jack_process.c 2019-06-22 03:01:13.578591184 -0300 | |
+++ jackmaster-0.0.2-new/src/jack_process.c 2019-06-22 02:58:39.682845773 -0300 | |
@@ -20,6 +20,8 @@ | |
* | |
*/ | |
+//#include "jack_if.h" | |
+ | |
int jack_warm= 0; | |
sample_t int_gain[MAX_CHANNELS][MAX_FADERS]; | |
@@ -54,8 +56,8 @@ | |
int x; | |
// DBG("port=%p conns=%d)\n", port, conns); | |
- | |
-/* | |
+ | |
+/* | |
#if AUTO_PORTS == 1 | |
check_auto(master_idx+jm->masters); | |
check_auto(master_idx+jm->masters); | |
@@ -162,7 +164,7 @@ | |
jm_jack_conn (int channel, int fader, char * connect_to) | |
{ | |
char * source, * dest; | |
- | |
+ | |
DBG("(channel=%d, fader=%d, connect_to='%s')\n", channel, fader, connect_to); | |
if (fader < jm->ins) | |
Only in jackmaster-0.0.2-new/src: .jack_process.c.swp | |
Only in jackmaster-0.0.2-new/src: .jm_if_t.h.swp | |
diff -r -u jackmaster-0.0.2/src/main.c jackmaster-0.0.2-new/src/main.c | |
--- jackmaster-0.0.2/src/main.c 2019-06-22 03:01:13.575591267 -0300 | |
+++ jackmaster-0.0.2-new/src/main.c 2019-06-22 03:00:28.160847107 -0300 | |
@@ -352,7 +352,7 @@ | |
update_meters (gpointer data) | |
{ | |
int x; | |
- | |
+ | |
if (!visible) return TRUE; | |
gdk_threads_enter(); | |
@@ -424,7 +424,7 @@ | |
} | |
DBG(": saving connections done. todo_cnt= %d\n", todo_cnt); | |
-nosave: | |
+nosave: | |
if (jm_jack_start(1)) return TRUE; | |
loop: | |
@@ -599,7 +599,7 @@ | |
jm_gtk_init (int argc, char * argv[]) | |
{ | |
#ifdef HAVE_ALSA | |
- g_thread_init(NULL); | |
+ //g_thread_init(NULL); | |
# ifdef USE_GTK_2_0 | |
gdk_threads_init(); | |
# endif | |
Only in jackmaster-0.0.2-new/src: .main.c.swp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmake_minimum_required(VERSION 2.6) | |
project(jackmaster) | |
find_package(PkgConfig REQUIRED) | |
pkg_search_module(GLIB REQUIRED glib-2.0) | |
pkg_search_module(GTK REQUIRED gtk+-2.0) | |
pkg_search_module(LASH REQUIRED lash-1.0) | |
set(CMAKE_C_FLAGS "-DPROGNAME=\\\"jackmaster\\\" -DDATA_ROOT_DIR=\\\"/usr/local/share\\\" -DHAVE_CONFIG_H -DHAVE_ALSA -DHAVE_LASH -DUSE_GTK_2_0 -include config.h") | |
add_executable(jackmaster src/main.c src/gtkhelper.c src/gui.c src/alsa_if.c src/gtkmeter.c src/configfile.c src/jack_if.c src/jack_engine.c) | |
target_include_directories(jackmaster PRIVATE ${GLIB_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} "." ${LASH_INCLUDE_DIRS} "src") | |
target_link_libraries(jackmaster lash m ${GLIB_LIBRARIES} ${GTK_LDFLAGS} pthread jack asound) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
with import <nixpkgs> {}; | |
stdenv.mkDerivation rec { | |
name = "jackmaster-0.0.2"; | |
src = fetchurl { | |
url = "http://69b.org/web69/dl/jackmaster-0.0.2.cpio.7z"; | |
sha256 = "1pdxj63v6gbh61p0h94zdwwxl8y5n8x3756ga3bfz12lp2i8cigm"; | |
}; | |
preUnpack = '' | |
7zcpio() { | |
if ! [[ "$curSrc" =~ \.cpio.7z$ ]]; then return 1; fi | |
7z e $src -so | cpio -i | |
ls -ltrh jack*/src/ | |
} | |
unpackCmdHooks=(7zcpio) | |
''; | |
patches = [ ./changes.patch ]; | |
postPatch = '' | |
cp ${./CMakeLists.txt} CMakeLists.txt | |
touch ac_cfg.h | |
''; | |
makeFlags = [ "V=1" ]; | |
buildInputs = [ | |
p7zip | |
cpio | |
lash | |
libjack2 | |
gnome2.gtk | |
alsaLib | |
pcre | |
fribidi | |
]; | |
nativeBuildInputs = [ | |
pkgconfig | |
cmake | |
]; | |
installPhase = '' | |
mkdir -p $out/bin | |
cp jackmaster $out/bin/ | |
''; | |
meta = { | |
homepage = http://69b.org/cms/software/jackmaster; | |
}; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment