diff options
| author | Werner Schweer <ws.seh.de> | 2008-06-25 17:43:56 +0000 |
|---|---|---|
| committer | Werner Schweer <ws.seh.de> | 2008-06-25 17:43:56 +0000 |
| commit | 9498962e76d4c1757af6d03eb0ee187821090281 (patch) | |
| tree | bfddad7b7017d6d56123c6e20cc01704ec9930bd | |
| parent | 72df6bf90cb1e9e776873b59f1644a7117a6228b (diff) | |
cleanups
| -rw-r--r-- | muse/muse/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | muse/muse/audiodev.h (renamed from muse/muse/driver/audiodev.h) | 0 | ||||
| -rw-r--r-- | muse/muse/driver.h (renamed from muse/muse/driver/driver.h) | 0 | ||||
| -rw-r--r-- | muse/muse/driver/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | muse/muse/dummyaudio.cpp (renamed from muse/muse/driver/dummyaudio.cpp) | 0 | ||||
| -rw-r--r-- | muse/muse/jack.cpp (renamed from muse/muse/driver/jack.cpp) | 0 | ||||
| -rw-r--r-- | muse/muse/jackaudio.h (renamed from muse/muse/driver/jackaudio.h) | 0 | ||||
| -rw-r--r-- | muse/muse/port.h (renamed from muse/muse/driver/port.h) | 0 |
8 files changed, 1 insertions, 22 deletions
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt index 68eeddaf..1bda0e5c 100644 --- a/muse/muse/CMakeLists.txt +++ b/muse/muse/CMakeLists.txt @@ -29,7 +29,6 @@ subdirs ( midiedit widgets master - driver instruments marker liste @@ -159,6 +158,7 @@ add_executable ( muse audiogroup.cpp exportmidi.cpp revision.cpp + jack.cpp dummyaudio.cpp ) set_target_properties( muse @@ -168,7 +168,6 @@ set_target_properties( muse target_link_libraries(muse midiedit master - driver instruments marker liste diff --git a/muse/muse/driver/audiodev.h b/muse/muse/audiodev.h index 55830c14..55830c14 100644 --- a/muse/muse/driver/audiodev.h +++ b/muse/muse/audiodev.h diff --git a/muse/muse/driver/driver.h b/muse/muse/driver.h index c8bbfc7f..c8bbfc7f 100644 --- a/muse/muse/driver/driver.h +++ b/muse/muse/driver.h diff --git a/muse/muse/driver/CMakeLists.txt b/muse/muse/driver/CMakeLists.txt deleted file mode 100644 index 80612301..00000000 --- a/muse/muse/driver/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# -# -# -# - -IF (APPLE) -set ( driver_src - jack.cpp dummyaudio.cpp coretimer.cpp coremidi.cpp - ) -ELSE (APPLE) -set ( driver_src - jack.cpp dummyaudio.cpp - ) -ENDIF (APPLE) - -add_library ( driver STATIC ${driver_src} ) -set_target_properties( driver - PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h" - ) - diff --git a/muse/muse/driver/dummyaudio.cpp b/muse/muse/dummyaudio.cpp index b4bc73ff..b4bc73ff 100644 --- a/muse/muse/driver/dummyaudio.cpp +++ b/muse/muse/dummyaudio.cpp diff --git a/muse/muse/driver/jack.cpp b/muse/muse/jack.cpp index cde57418..cde57418 100644 --- a/muse/muse/driver/jack.cpp +++ b/muse/muse/jack.cpp diff --git a/muse/muse/driver/jackaudio.h b/muse/muse/jackaudio.h index 0322b3b8..0322b3b8 100644 --- a/muse/muse/driver/jackaudio.h +++ b/muse/muse/jackaudio.h diff --git a/muse/muse/driver/port.h b/muse/muse/port.h index d2f83de9..d2f83de9 100644 --- a/muse/muse/driver/port.h +++ b/muse/muse/port.h |