summaryrefslogtreecommitdiff
path: root/src/fruits/cmv
diff options
context:
space:
mode:
Diffstat (limited to 'src/fruits/cmv')
-rw-r--r--src/fruits/cmv/cmv.c6
-rw-r--r--src/fruits/cmv/input_simulator.c53
-rw-r--r--src/fruits/cmv/input_simulator.h6
-rw-r--r--src/fruits/cmv/meson.build2
4 files changed, 1 insertions, 66 deletions
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 9e3be3f..0fe33ad 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -11,8 +11,6 @@
#include "../../server/common.c"
#endif
-#include "input_simulator.h"
-
struct cmv {
struct aki_event_loop loop;
struct camu_desktop desktop;
@@ -123,12 +121,8 @@ s32 wmain(s32 argc, wchar_t **argv)
struct aki_thread thread0;
aki_thread_create(&thread0, event_loop_thread, &c);
- //cmv_input_simulator_run(&c.desktop.sink);
-
while (camu_desktop_tick(&c.desktop)) {}
- //cmv_input_simulator_stop();
-
camu_desktop_stop(&c.desktop);
aki_thread_join(&thread0);
camu_desktop_free(&c.desktop);
diff --git a/src/fruits/cmv/input_simulator.c b/src/fruits/cmv/input_simulator.c
deleted file mode 100644
index 7bc3125..0000000
--- a/src/fruits/cmv/input_simulator.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <aki/thread.h>
-#include <al/random.h>
-
-#include "input_simulator.h"
-
-static struct aki_thread thread;
-static s32 quit = 0;
-
-enum {
- SKIP = 0,
- BACKSKIP,
- SHUFFLE,
- BASE, // count
- TOGGLE_PAUSE,
- SEEK,
-};
-
-static aki_thread_result AKI_THREADCALL input_simulation_thread(void *userdata)
-{
- struct camu_sink *sink = (struct camu_sink *)userdata;
- while (!quit) {
- aki_thread_sleep(AKI_TS_FROM_USEC(30000));
- switch (al_rand() % BASE) {
- case SKIP:
- camu_sink_skip(sink, (al_rand() % 5));
- break;
- case BACKSKIP:
- camu_sink_skip(sink, -(al_rand() % 5));
- break;
- case SHUFFLE:
- camu_sink_shuffle(sink);
- break;
- case TOGGLE_PAUSE:
- camu_sink_toggle_pause(sink);
- break;
- case SEEK:
- camu_sink_seek(sink, 0.0);
- break;
- }
- }
- return 0;
-}
-
-void cmv_input_simulator_run(struct camu_sink *sink)
-{
- aki_thread_create(&thread, input_simulation_thread, sink);
-}
-
-void cmv_input_simulator_stop(void)
-{
- quit = 1;
- aki_thread_join(&thread);
-}
diff --git a/src/fruits/cmv/input_simulator.h b/src/fruits/cmv/input_simulator.h
deleted file mode 100644
index 5380bb2..0000000
--- a/src/fruits/cmv/input_simulator.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "../../libsink/sink.h"
-
-void cmv_input_simulator_run(struct camu_sink *sink);
-void cmv_input_simulator_stop(void);
diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build
index b2ab0a2..9b83847 100644
--- a/src/fruits/cmv/meson.build
+++ b/src/fruits/cmv/meson.build
@@ -1,4 +1,4 @@
-cmv_src = ['cmv.c', 'input_simulator.c']
+cmv_src = ['cmv.c']
cmv_deps = [common_deps, desktop]
cmv_args = []
if get_option('sink-only')