Diffstat (limited to 'libopie2/opiemm/osoundsystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 12 |
1 files changed, 7 insertions, 5 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,10 +1,9 @@ | |||
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 |
@@ -25,28 +24,31 @@ | |||
25 | If not, write to the Free Software Foundation, | 24 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 25 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 26 | Boston, MA 02111-1307, USA. |
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> |
37 | #include <sys/ioctl.h> | 41 | #include <sys/ioctl.h> |
38 | #include <sys/types.h> | 42 | #include <sys/types.h> |
39 | #include <sys/soundcard.h> | 43 | #include <sys/soundcard.h> |
40 | #include <sys/stat.h> | 44 | #include <sys/stat.h> |
41 | 45 | ||
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 | *======================================================================================*/ |
50 | 52 | ||
51 | OSoundSystem* OSoundSystem::_instance = 0; | 53 | OSoundSystem* OSoundSystem::_instance = 0; |
52 | 54 | ||