summaryrefslogtreecommitdiff
path: root/plugins/hotkeys
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2011-02-21 21:45:48 +0100
committerGravatar waker <wakeroid@gmail.com>2011-02-21 21:45:48 +0100
commit01d462cd0d8d9e43d4a4eab013af836cee0604e1 (patch)
tree9097ac36ed53ba02eac369645cec95dee71968bf /plugins/hotkeys
parent10dbebc87c1292877d00eaef8a5ddcc51aac8ff1 (diff)
possible fix to gnome vs hotkeys plugin vs reboot problem
Diffstat (limited to 'plugins/hotkeys')
-rw-r--r--plugins/hotkeys/hotkeys.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c
index 0cc246b0..17c45a72 100644
--- a/plugins/hotkeys/hotkeys.c
+++ b/plugins/hotkeys/hotkeys.c
@@ -461,7 +461,7 @@ hotkeys_event_loop (void *unused) {
}
static int
-hotkeys_start (void) {
+hotkeys_connect (void) {
finished = 0;
loop_tid = 0;
disp = XOpenDisplay (NULL);
@@ -475,12 +475,11 @@ hotkeys_start (void) {
read_config (disp);
XSync (disp, 0);
loop_tid = deadbeef->thread_start (hotkeys_event_loop, 0);
-
return 0;
}
static int
-hotkeys_stop (void) {
+hotkeys_disconnect (void) {
if (loop_tid) {
finished = 1;
deadbeef->thread_join (loop_tid);
@@ -702,9 +701,9 @@ static DB_hotkeys_plugin_t plugin = {
.misc.plugin.author = "Viktor Semykin",
.misc.plugin.email = "thesame.ml@gmail.com",
.misc.plugin.website = "http://deadbeef.sf.net",
- .misc.plugin.start = hotkeys_start,
- .misc.plugin.stop = hotkeys_stop,
.misc.plugin.get_actions = hotkeys_get_actions,
+ .misc.plugin.connect = hotkeys_connect,
+ .misc.plugin.disconnect = hotkeys_disconnect,
.get_name_for_keycode = hotkeys_get_name_for_keycode,
.reset = hotkeys_reset,
};