Diffstat (limited to 'libopie2/opiemm/osoundsystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 6c03203..2956682 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -37,52 +37,48 @@ | |||
37 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <sys/soundcard.h> | 39 | #include <sys/soundcard.h> |
40 | #include <sys/stat.h> | 40 | #include <sys/stat.h> |
41 | 41 | ||
42 | static const char* device_label[] = SOUND_DEVICE_LABELS; | 42 | static const char* device_label[] = SOUND_DEVICE_LABELS; |
43 | static int max_device_nr = sizeof device_label / sizeof (const char*); | 43 | static int max_device_nr = sizeof device_label / sizeof (const char*); |
44 | 44 | ||
45 | using namespace Opie::Core; | 45 | using namespace Opie::Core; |
46 | using namespace Opie::MM; | 46 | using namespace Opie::MM; |
47 | /*====================================================================================== | 47 | /*====================================================================================== |
48 | * OSoundSystem | 48 | * OSoundSystem |
49 | *======================================================================================*/ | 49 | *======================================================================================*/ |
50 | 50 | ||
51 | OSoundSystem* OSoundSystem::_instance = 0; | 51 | OSoundSystem* OSoundSystem::_instance = 0; |
52 | 52 | ||
53 | OSoundSystem::OSoundSystem() | 53 | OSoundSystem::OSoundSystem() |
54 | { | 54 | { |
55 | odebug << "OSoundSystem::OSoundSystem()" << oendl; | 55 | odebug << "OSoundSystem::OSoundSystem()" << oendl; |
56 | synchronize(); | 56 | synchronize(); |
57 | } | 57 | } |
58 | 58 | ||
59 | void OSoundSystem::synchronize() | 59 | void OSoundSystem::synchronize() |
60 | { | 60 | { |
61 | // gather available interfaces by inspecting /dev | ||
62 | //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices | ||
63 | //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices | ||
64 | |||
65 | _interfaces.clear(); | 61 | _interfaces.clear(); |
66 | _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) ); | 62 | _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) ); |
67 | 63 | ||
68 | /* | 64 | /* |
69 | 65 | ||
70 | QString str; | 66 | QString str; |
71 | QFile f( "/dev/sound" ); | 67 | QFile f( "/dev/sound" ); |
72 | bool hasFile = f.open( IO_ReadOnly ); | 68 | bool hasFile = f.open( IO_ReadOnly ); |
73 | if ( !hasFile ) | 69 | if ( !hasFile ) |
74 | { | 70 | { |
75 | odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; | 71 | odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl; |
76 | return; | 72 | return; |
77 | } | 73 | } |
78 | QTextStream s( &f ); | 74 | QTextStream s( &f ); |
79 | s.readLine(); | 75 | s.readLine(); |
80 | s.readLine(); | 76 | s.readLine(); |
81 | while ( !s.atEnd() ) | 77 | while ( !s.atEnd() ) |
82 | { | 78 | { |
83 | s >> str; | 79 | s >> str; |
84 | str.truncate( str.find( ':' ) ); | 80 | str.truncate( str.find( ':' ) ); |
85 | odebug << "OSoundSystem: found interface '" << str << "'" << oendl; | 81 | odebug << "OSoundSystem: found interface '" << str << "'" << oendl; |
86 | OAudioInterface* iface; | 82 | OAudioInterface* iface; |
87 | iface = new OAudioInterface( this, (const char*) str ); | 83 | iface = new OAudioInterface( this, (const char*) str ); |
88 | 84 | ||