author | llornkcor <llornkcor> | 2002-11-04 00:41:07 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-04 00:41:07 (UTC) |
commit | 08fdebd78a4266642a7bdb2b1ead6e306bda64ad (patch) (side-by-side diff) | |
tree | 8266160d575107b710457c3dfcd84e415268a92d | |
parent | dc44b0babe9ffa7b29cc6269596703bab8edf6ab (diff) | |
download | opie-08fdebd78a4266642a7bdb2b1ead6e306bda64ad.zip opie-08fdebd78a4266642a7bdb2b1ead6e306bda64ad.tar.gz opie-08fdebd78a4266642a7bdb2b1ead6e306bda64ad.tar.bz2 |
various
-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 76 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 35 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.h | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 59 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.h | 2 |
5 files changed, 92 insertions, 93 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 020f6be..136e06c 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp @@ -34,13 +34,8 @@ #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) #include "qpe/qcopenvelope_qws.h" #endif -// #ifdef Q_WS_WIN -// #include <windows.h> -// #include <mmsystem.h> -// #include <mmreg.h> -// #endif #if defined(Q_WS_X11) || defined(Q_WS_QWS) #include <fcntl.h> #include <sys/ioctl.h> #include <sys/soundcard.h> @@ -49,13 +44,8 @@ #include <sys/types.h> #include <unistd.h> #endif -// #if defined(Q_OS_WIN32) -// static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; -// static const int timerResolutionMilliSeconds = 30; -// static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; -// #else # if defined(QT_QWS_IPAQ) static const int sound_fragment_shift = 14; # else static const int sound_fragment_shift = 16; @@ -100,25 +90,8 @@ unsigned int AudioDevicePrivate::rightVolume = 0; void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { muted = AudioDevicePrivate::muted; unsigned int volume; -// #ifdef Q_OS_WIN32 -// HWAVEOUT handle; -// WAVEFORMATEX formatData; -// formatData.cbSize = sizeof(WAVEFORMATEX); -// formatData.wFormatTag = WAVE_FORMAT_PCM; -// formatData.nAvgBytesPerSec = 4 * 44000; -// formatData.nBlockAlign = 4; -// formatData.nChannels = 2; -// formatData.nSamplesPerSec = 44000; -// formatData.wBitsPerSample = 16; -// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); -// if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) -// // qDebug( "get volume of audio device failed" ); -// waveOutClose( handle ); -// leftVolume = volume & 0xFFFF; -// rightVolume = volume >> 16; -// #else int mixerHandle = open( "/dev/mixer", O_RDWR ); if ( mixerHandle >= 0 ) { if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) perror("ioctl(\"MIXER_READ\")"); @@ -126,9 +99,8 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume } else perror("open(\"/dev/mixer\")"); leftVolume = ((volume & 0x00FF) << 16) / 101; rightVolume = ((volume & 0xFF00) << 8) / 101; -//#endif } void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { @@ -141,24 +113,8 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, } else { leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); } -// #ifdef Q_OS_WIN32 -// HWAVEOUT handle; -// WAVEFORMATEX formatData; -// formatData.cbSize = sizeof(WAVEFORMATEX); -// formatData.wFormatTag = WAVE_FORMAT_PCM; -// formatData.nAvgBytesPerSec = 4 * 44000; -// formatData.nBlockAlign = 4; -// formatData.nChannels = 2; -// formatData.nSamplesPerSec = 44000; -// formatData.wBitsPerSample = 16; -// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); -// unsigned int volume = (rightVolume << 16) | leftVolume; -// if ( waveOutSetVolume( handle, volume ) ) -// // qDebug( "set volume of audio device failed" ); -// waveOutClose( handle ); -// #else // Volume can be from 0 to 100 which is 101 distinct values unsigned int rV = (rightVolume * 101) >> 16; # if 0 @@ -189,9 +145,8 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, } - AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { qDebug("creating new audio device"); QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; d = new AudioDevicePrivate; @@ -265,17 +220,13 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { AudioDevice::~AudioDevice() { qDebug("destryo audiodevice"); QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; -// #ifdef Q_OS_WIN32 -// waveOutClose( (HWAVEOUT)d->handle ); -// #else # ifndef KEEP_DEVICE_OPEN close( d->handle ); // Now it should be safe to shut the handle # endif delete d->unwrittenBuffer; delete d; -//#endif QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; } @@ -287,22 +238,8 @@ void AudioDevice::volumeChanged( bool muted ) void AudioDevice::write( char *buffer, unsigned int length ) { -// #ifdef Q_OS_WIN32 -// // returns immediately and (to be implemented) emits completedIO() when finished writing -// WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); -// // maybe the buffer should be copied so that this fool proof, but its a performance hit -// lpWaveHdr->lpData = buffer; -// lpWaveHdr->dwBufferLength = length; -// lpWaveHdr->dwFlags = 0L; -// lpWaveHdr->dwLoops = 0L; -// waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); -// // waveOutWrite returns immediately. the data is sent in the background. -// if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) -// qDebug( "failed to write block to audio device" ); -// // emit completedIO(); -// #else int t = ::write( d->handle, buffer, length ); if ( t<0 ) t = 0; if ( t != (int)length) { qDebug("Ahhh!! memcpys 1"); @@ -337,11 +274,8 @@ unsigned int AudioDevice::bufferSize() const } unsigned int AudioDevice::canWrite() const { -// #ifdef Q_OS_WIN32 -// return bufferSize(); // Any better? -// #else audio_buf_info info; if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { d->can_GETOSPACE = FALSE; fcntl( d->handle, F_SETFL, O_NONBLOCK ); @@ -364,26 +298,16 @@ unsigned int AudioDevice::canWrite() const return 0; else return d->bufferSize; } -//#endif } int AudioDevice::bytesWritten() { -// #ifdef Q_OS_WIN32 -// MMTIME pmmt = { TIME_BYTES, 0 }; -// if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { -// qDebug( "failed to get audio device position" ); -// return -1; -// } -// return pmmt.u.cb; -// #else int buffered = 0; if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { qDebug( "failed to get audio device position" ); return -1; } return buffered; -//#endif } diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index d20d560..ef7c8dc 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -145,16 +145,16 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); - connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); +// connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); // Intialise state setLength( mediaPlayerState->length() ); setPosition( mediaPlayerState->position() ); setLooping( mediaPlayerState->fullscreen() ); - setPaused( mediaPlayerState->paused() ); +// setPaused( mediaPlayerState->paused() ); setPlaying( mediaPlayerState->playing() ); } @@ -362,9 +362,18 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { case AudioVolumeUp: qDebug("more clicked"); emit moreClicked(); return; - case AudioVolumeDown: emit lessClicked(); return; + case AudioVolumeDown: + qDebug("less clicked"); + emit lessClicked(); + return; + case AudioForward: + emit forwardClicked(); + return; + case AudioBack: + emit backClicked(); + return; } } else if ( !isOnButton && audioButtons[i].isHeld ) { audioButtons[i].isHeld = FALSE; toggleButton(i); @@ -374,11 +383,19 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { audioButtons[i].isHeld = FALSE; if ( !audioButtons[i].isToggle ) setToggleButton( i, FALSE ); switch (i) { - case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return; + case AudioPlay: + if( mediaPlayerState->isPaused ) { + mediaPlayerState->setPaused( FALSE ); + return; + } else if( !mediaPlayerState->isPaused ) { + mediaPlayerState->setPaused( TRUE ); + return; + } +// case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return; case AudioStop: mediaPlayerState->setPlaying(FALSE); return; - case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return; +// case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return; case AudioNext: mediaPlayerState->setNext(); return; case AudioPrevious: mediaPlayerState->setPrev(); return; case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; case AudioVolumeUp: emit moreReleased(); return; @@ -462,18 +479,18 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) } } break; case Key_Down: //volume - toggleButton(6); +// toggleButton(6); emit lessClicked(); emit lessReleased(); - toggleButton(6); +// toggleButton(6); break; case Key_Up: //volume - toggleButton(5); +// toggleButton(5); emit moreClicked(); emit moreReleased(); - toggleButton(5); +// toggleButton(5); break; case Key_Right: //next in playlist // toggleButton(3); mediaPlayerState->setNext(); diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h index c686741..96bc55c 100644 --- a/core/multimedia/opieplayer/audiowidget.h +++ b/core/multimedia/opieplayer/audiowidget.h @@ -35,17 +35,18 @@ class QPixmap; enum AudioButtons { - AudioPlay, + AudioPlay=0, AudioStop, - AudioPause, AudioNext, AudioPrevious, AudioVolumeUp, AudioVolumeDown, AudioLoop, - AudioPlayList + AudioPlayList, + AudioForward, + AudioBack }; //#define USE_DBLBUF @@ -60,9 +61,9 @@ public: public slots: void updateSlider( long, long ); void sliderPressed( ); void sliderReleased( ); - void setPaused( bool b) { setToggleButton( AudioPause, b ); } +// void setPaused( bool b) { setToggleButton( AudioPause, b ); } void setLooping( bool b) { setToggleButton( AudioLoop, b ); } void setPlaying( bool b) { setToggleButton( AudioPlay, b ); } void setPosition( long ); void setLength( long ); @@ -73,8 +74,12 @@ signals: void lessClicked(); void moreReleased(); void lessReleased(); void sliderMoved(long); + void forwardClicked(); + void backClicked(); + void forwardReleased(); + void backReleased(); protected: void doBlank(); void doUnblank(); diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index b0963cf..4f3823a 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp @@ -105,16 +105,18 @@ void MediaPlayer::setPlaying( bool play ) { } if ( ((currentFile->file()).left(4) != "http") && !QFile::exists( currentFile->file() ) ) { QMessageBox::critical( 0, tr( "File not found"), - tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" ); + tr( "The following file was not found: <i>" ) + + currentFile->file() + "</i>" ); mediaPlayerState->setPlaying( FALSE ); return; } if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) { QMessageBox::critical( 0, tr( "No decoder found"), - tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" ); + tr( "Sorry, no appropriate decoders found for this file: <i>" ) + + currentFile->file() + "</i>" ); mediaPlayerState->setPlaying( FALSE ); return; } @@ -175,21 +177,72 @@ void MediaPlayer::startDecreasingVolume() { void MediaPlayer::startIncreasingVolume() { volumeDirection = +1; startTimer( 100 ); AudioDevice::increaseVolume(); + } +bool drawnOnScreenDisplay = FALSE; +unsigned int onScreenDisplayVolume = 0; +const int yoff = 110; void MediaPlayer::stopChangingVolume() { killTimers(); + + // Get rid of the on-screen display stuff + drawnOnScreenDisplay = FALSE; + onScreenDisplayVolume = 0; + int w = audioUI->width(); + int h = audioUI->height(); + audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); } void MediaPlayer::timerEvent( QTimerEvent * ) { +// qDebug("timer"); if ( volumeDirection == +1 ) - AudioDevice::increaseVolume(); + AudioDevice::increaseVolume(); else if ( volumeDirection == -1 ) AudioDevice::decreaseVolume(); + + // Display an on-screen display volume + unsigned int l, r, v; bool m; + AudioDevice::getVolume( l, r, m ); + v = ((l + r) * 11) / (2*0xFFFF); + + if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) { +// qDebug("returning %d, %d, %d, %d", v, l, r, m); + return; + } + + int w = audioUI->width(); + int h = audioUI->height(); + + if ( drawnOnScreenDisplay ) { + if ( onScreenDisplayVolume > v ) + audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, + (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); + } + + drawnOnScreenDisplay = TRUE; + onScreenDisplayVolume = v; + + QPainter p( audioUI ); + p.setPen( QColor( 0x10, 0xD0, 0x10 ) ); + p.setBrush( QColor( 0x10, 0xD0, 0x10 ) ); + + QFont f; + f.setPixelSize( 20 ); + f.setBold( TRUE ); + p.setFont( f ); + p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") ); + + for ( unsigned int i = 0; i < 10; i++ ) { + if ( v > i ) + p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); + else + p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); + } } void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { switch ( e->key() ) { diff --git a/core/multimedia/opieplayer/mediaplayerstate.h b/core/multimedia/opieplayer/mediaplayerstate.h index 26185c5..1c65599 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.h +++ b/core/multimedia/opieplayer/mediaplayerstate.h @@ -32,8 +32,9 @@ class MediaPlayerState : public QObject { Q_OBJECT public: MediaPlayerState( QObject *parent, const char *name ); ~MediaPlayerState(); + bool isPaused; bool isStreaming; bool fullscreen() { return isFullscreen; } bool scaled() { return isScaled; } @@ -100,9 +101,8 @@ private: bool isScaled; bool isLooping; bool isShuffled; bool usePlaylist; - bool isPaused; bool isPlaying; long curPosition; long curLength; char curView; |