-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 | |||
@@ -143,17 +143,17 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
143 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; | 143 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; |
144 | #endif | 144 | #endif |
145 | } | 145 | } |
146 | 146 | ||
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; |
156 | qDebug("%d",bps); | 156 | qDebug("%d",bps); |
157 | int format=0; | 157 | int format=0; |
158 | if( bps == 8) format = AFMT_U8; | 158 | if( bps == 8) format = AFMT_U8; |
159 | else if( bps <= 0) format = AFMT_S16_LE; | 159 | else if( bps <= 0) format = AFMT_S16_LE; |
@@ -195,17 +195,17 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
195 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) | 195 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) |
196 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 196 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
197 | qDebug("channels %d",d->channels); | 197 | qDebug("channels %d",d->channels); |
198 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { | 198 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { |
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; |
208 | d->can_GETOSPACE = TRUE; // until we find otherwise | 208 | d->can_GETOSPACE = TRUE; // until we find otherwise |
209 | 209 | ||
210 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); | 210 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); |
211 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); | 211 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); |
@@ -214,24 +214,24 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
214 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); | 214 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); |
215 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 215 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
216 | 216 | ||
217 | } | 217 | } |
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 | ||
234 | void AudioDevice::volumeChanged( bool muted ) | 234 | void AudioDevice::volumeChanged( bool muted ) |
235 | { | 235 | { |
236 | AudioDevicePrivate::muted = muted; | 236 | AudioDevicePrivate::muted = muted; |
237 | } | 237 | } |
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 | |||
@@ -209,17 +209,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
209 | populateSkinsMenu(); | 209 | populateSkinsMenu(); |
210 | 210 | ||
211 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); | 211 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); |
212 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); | 212 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); |
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" ); |
222 | // playlistView->setMinimumSize(236,260); | 222 | // playlistView->setMinimumSize(236,260); |
223 | tabWidget->insertTab( pTab,"Playlist"); | 223 | tabWidget->insertTab( pTab,"Playlist"); |
224 | 224 | ||
225 | 225 | ||
@@ -320,17 +320,20 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
320 | 320 | ||
321 | 321 | ||
322 | //playlists | 322 | //playlists |
323 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); | 323 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); |
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 | ||
333 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 336 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); |
334 | 337 | ||
335 | setCentralWidget( vbox5 ); | 338 | setCentralWidget( vbox5 ); |
336 | 339 | ||
@@ -719,17 +722,17 @@ void PlayListWidget::addSelected() { | |||
719 | lnk.setFile( filename ); //sets file name | 722 | lnk.setFile( filename ); //sets file name |
720 | d->selectedFiles->addToSelection( lnk); | 723 | d->selectedFiles->addToSelection( lnk); |
721 | } | 724 | } |
722 | } | 725 | } |
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 | ||
732 | void PlayListWidget::removeSelected() { | 735 | void PlayListWidget::removeSelected() { |
733 | d->selectedFiles->removeSelected( ); | 736 | d->selectedFiles->removeSelected( ); |
734 | } | 737 | } |
735 | 738 | ||
@@ -756,17 +759,17 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
756 | QString filename; | 759 | QString filename; |
757 | 760 | ||
758 | filename=it->text(3); | 761 | filename=it->text(3); |
759 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name | 762 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name |
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 | ||
769 | void PlayListWidget::tabChanged(QWidget *) { | 772 | void PlayListWidget::tabChanged(QWidget *) { |
770 | 773 | ||
771 | switch ( tabWidget->currentPageIndex()) { | 774 | switch ( tabWidget->currentPageIndex()) { |
772 | case 0: | 775 | case 0: |