allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Remove clearly worthless (doesn't event parse, let alone compile) TRANSZPORT_THREADS stuff.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6612 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2010-02-01 20:03:07 +00:00
parent ae1abc4ea6
commit fe0b06bb9b
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/surfaces/tranzport/init.cc
View File

@@ -88,16 +88,6 @@ TranzportControlProtocol::set_active (bool yn)
if (pthread_create_and_store (X_("tranzport monitor"), &thread, _monitor_work, this) == 0) {
_active = true;
#if TRANZPORT_THREADS
if (pthread_create_and_store (X_("tranzport read"), &thread_read, _read_work, this) == 0) {
_active_read = true;
if (pthread_create_and_store (X_("tranzport write"), &thread_write, _write_work, this) == 0) {
_active_write = true;
if (pthread_create_and_store (X_("tranzport process"), &thread_process, _process_work, this) == 0) {
_active_process = true;
if (pthread_create_and_store (X_("tranzport timer"), &thread_timer, _process_timer, this) == 0) {
_active_process = true;
#endif
} else {
return -1;
}
@@ -112,19 +102,14 @@ TranzportControlProtocol::set_active (bool yn)
// thread FIXME - wait til all writes are done
for(int x = 0; (x < 20/MAX_TRANZPORT_INFLIGHT) && flush(); x++) { usleep(100); }
}
#if TRANZPORT_THREADS
pthread_cancel_one (_thread_timer);
pthread_cancel_one (_thread_process);
pthread_cancel_one (_thread_read);
pthread_cancel_one (_thread_write);
#endif
pthread_cancel_one (thread);
cerr << "Tranzport Thread dead\n";
close ();
_active = false;
cerr << "End tranzport shutdown\n";
}
}
}
return 0;

1
libs/surfaces/tranzport/tranzport_base.h
View File

@@ -49,7 +49,6 @@
#define MAX_RETRY 1
#define MAX_TRANZPORT_INFLIGHT 4
#define DEBUG_TRANZPORT 0
#define TRANZPORT_THREADS 0
#ifndef HAVE_TRANZPORT_KERNEL_DRIVER
#define HAVE_TRANZPORT_KERNEL_DRIVER 0

8
libs/surfaces/tranzport/tranzport_control_protocol.h
View File

@@ -145,7 +145,7 @@ private:
BlingEnter,
BlingExit
};
pthread_t thread;
#if HAVE_TRANZPORT_KERNEL_DRIVER
int udev;
@@ -153,18 +153,12 @@ private:
usb_dev_handle* udev;
#endif
#if TRANZPORT_THREADS
pthread_t thread_read;
#endif
int last_read_error;
uint32_t buttonmask;
uint32_t timeout;
uint32_t inflight;
uint32_t current_track_id;
#if TRANZPORT_THREADS
pthread_t thread_write;
#endif
int last_write_error;
uint8_t _datawheel;
uint8_t _device_status;