author | llornkcor <llornkcor> | 2003-02-16 21:28:48 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-02-16 21:28:48 (UTC) |
commit | e0eb3f016d7f8a1e1e5548ef8aa115fef8999697 (patch) (unidiff) | |
tree | cbbabd894c57770cfe6b9ab1da577a50d268e4d4 | |
parent | 73aed6b9a34330b31f05864746269017cd53017d (diff) | |
download | opie-e0eb3f016d7f8a1e1e5548ef8aa115fef8999697.zip opie-e0eb3f016d7f8a1e1e5548ef8aa115fef8999697.tar.gz opie-e0eb3f016d7f8a1e1e5548ef8aa115fef8999697.tar.bz2 |
fix small annoyances and bug
-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 8 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 136e06c..73e41dc 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -147,9 +147,9 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
147 | 147 | ||
148 | 148 | ||
149 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 149 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { |
150 | qDebug("creating new audio device"); | 150 | qDebug("creating new audio device"); |
151 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 151 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
152 | d = new AudioDevicePrivate; | 152 | d = new AudioDevicePrivate; |
153 | d->frequency = f; | 153 | d->frequency = f; |
154 | d->channels = chs; | 154 | d->channels = chs; |
155 | d->bytesPerSample = bps; | 155 | d->bytesPerSample = bps; |
@@ -199,9 +199,9 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
199 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; | 199 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; |
200 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) | 200 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) |
201 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 201 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
202 | } | 202 | } |
203 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 203 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
204 | 204 | ||
205 | d->bufferSize = sound_fragment_bytes; | 205 | d->bufferSize = sound_fragment_bytes; |
206 | d->unwrittenBuffer = new char[d->bufferSize]; | 206 | d->unwrittenBuffer = new char[d->bufferSize]; |
207 | d->unwritten = 0; | 207 | d->unwritten = 0; |
@@ -218,16 +218,16 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
218 | 218 | ||
219 | 219 | ||
220 | AudioDevice::~AudioDevice() { | 220 | AudioDevice::~AudioDevice() { |
221 | qDebug("destryo audiodevice"); | 221 | qDebug("destryo audiodevice"); |
222 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 222 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
223 | 223 | ||
224 | # ifndef KEEP_DEVICE_OPEN | 224 | # ifndef KEEP_DEVICE_OPEN |
225 | close( d->handle ); // Now it should be safe to shut the handle | 225 | close( d->handle ); // Now it should be safe to shut the handle |
226 | # endif | 226 | # endif |
227 | delete d->unwrittenBuffer; | 227 | delete d->unwrittenBuffer; |
228 | delete d; | 228 | delete d; |
229 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 229 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
230 | 230 | ||
231 | } | 231 | } |
232 | 232 | ||
233 | 233 | ||
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 3c5734e..a0bf4db 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -213,9 +213,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
213 | 213 | ||
214 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); | 214 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); |
215 | 215 | ||
216 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); | 216 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); |
217 | tabWidget->setTabShape(QTabWidget::Triangular); | 217 | // tabWidget->setTabShape(QTabWidget::Triangular); |
218 | 218 | ||
219 | QWidget *pTab; | 219 | QWidget *pTab; |
220 | pTab = new QWidget( tabWidget, "pTab" ); | 220 | pTab = new QWidget( tabWidget, "pTab" ); |
221 | // playlistView = new QListView( pTab, "playlistview" ); | 221 | // playlistView = new QListView( pTab, "playlistview" ); |
@@ -324,9 +324,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
324 | 324 | ||
325 | 325 | ||
326 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | 326 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); |
327 | 327 | ||
328 | // connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 328 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
329 | |||
330 | |||
331 | |||
329 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 332 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
330 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 333 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
331 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); | 334 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); |
332 | 335 | ||
@@ -723,9 +726,9 @@ void PlayListWidget::addSelected() { | |||
723 | videoView->clearSelection(); | 726 | videoView->clearSelection(); |
724 | } | 727 | } |
725 | break; | 728 | break; |
726 | }; | 729 | }; |
727 | tabWidget->setCurrentPage(0); | 730 | // tabWidget->setCurrentPage(0); |
728 | writeCurrentM3u(); | 731 | writeCurrentM3u(); |
729 | 732 | ||
730 | } | 733 | } |
731 | 734 | ||
@@ -760,9 +763,9 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
760 | lnk.setFile( filename ); //sets file name | 763 | lnk.setFile( filename ); //sets file name |
761 | d->selectedFiles->addToSelection( lnk); | 764 | d->selectedFiles->addToSelection( lnk); |
762 | 765 | ||
763 | writeCurrentM3u(); | 766 | writeCurrentM3u(); |
764 | tabWidget->setCurrentPage(0); | 767 | // tabWidget->setCurrentPage(0); |
765 | 768 | ||
766 | } | 769 | } |
767 | } | 770 | } |
768 | 771 | ||