author | mickeyl <mickeyl> | 2005-05-19 11:59:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-19 11:59:32 (UTC) |
commit | ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a (patch) (unidiff) | |
tree | 83b59755f58747cdb7e543a4c237e9e217b03fbd /libopie2/opiemm | |
parent | cb243f00d12c5fc40de02e7f9f20009b52303a66 (diff) | |
download | opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.zip opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.tar.gz opie-ed7ba8b228d3d0ffae9c9b68900b7f723d7ade4a.tar.bz2 |
- add linux pcmcia subsystem wrapper: OPcmciaSystem and OPcmciaCard
- move linux-only subsystems in subdirectory linux
- minor header cleanups
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 2956682..6f849cd 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -1,7 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | 3 | =. (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | =. | ||
5 | .=l. | 4 | .=l. |
6 | .>+-= | 5 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 6 | _;:, .> :=|. This program is free software; you can |
@@ -28,9 +27,14 @@ | |||
28 | 27 | ||
29 | */ | 28 | */ |
30 | 29 | ||
31 | #include <opie2/osoundsystem.h> | 30 | #include "osoundsystem.h" |
31 | using namespace Opie::MM; | ||
32 | |||
33 | /* OPIE */ | ||
32 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | using namespace Opie::Core; | ||
33 | 36 | ||
37 | /* STD */ | ||
34 | #include <errno.h> | 38 | #include <errno.h> |
35 | #include <fcntl.h> | 39 | #include <fcntl.h> |
36 | #include <string.h> | 40 | #include <string.h> |
@@ -42,8 +46,6 @@ | |||
42 | static const char* device_label[] = SOUND_DEVICE_LABELS; | 46 | static const char* device_label[] = SOUND_DEVICE_LABELS; |
43 | static int max_device_nr = sizeof device_label / sizeof (const char*); | 47 | static int max_device_nr = sizeof device_label / sizeof (const char*); |
44 | 48 | ||
45 | using namespace Opie::Core; | ||
46 | using namespace Opie::MM; | ||
47 | /*====================================================================================== | 49 | /*====================================================================================== |
48 | * OSoundSystem | 50 | * OSoundSystem |
49 | *======================================================================================*/ | 51 | *======================================================================================*/ |
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h index 5f6fb7a..1e48f5c 100644 --- a/libopie2/opiemm/osoundsystem.h +++ b/libopie2/opiemm/osoundsystem.h | |||
@@ -1,15 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | 3 | =. (C) 2003-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | =. | ||
5 | .=l. | 4 | .=l. |
6 | .>+-= | 5 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 6 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; version 2 of the License. |
12 | ._= =} : or (at your option) any later version. | 11 | ._= =} : |
13 | .%`+i> _;_. | 12 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 13 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
@@ -47,11 +46,11 @@ class OSoundCard; | |||
47 | *======================================================================================*/ | 46 | *======================================================================================*/ |
48 | 47 | ||
49 | /** | 48 | /** |
50 | * @brief A container class for all audio interfaces | 49 | * @brief A container class for the Linux OSS/ALSA audio subsystem |
51 | * | 50 | * |
52 | * This class provides access to all available audio/midi/sequencer interfaces of your computer. | 51 | * This class provides access to all available audio/midi/sequencer interfaces of your device. |
53 | * | 52 | * |
54 | * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | 53 | * @author Michael 'Mickey' Lauer <mickey@Vanille.de> |
55 | */ | 54 | */ |
56 | class OSoundSystem : public QObject | 55 | class OSoundSystem : public QObject |
57 | { | 56 | { |