author | simon <simon> | 2002-12-09 14:10:58 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 14:10:58 (UTC) |
commit | fffd954b4ea3c124a37cab9af99b248986029436 (patch) (unidiff) | |
tree | f5ae7f123b7e50957c7682cbb8b3c7144aadf71b /noncore/multimedia/opieplayer2/videowidget.cpp | |
parent | 17f319bb44feb947a26be333a4c7e6fef7020c87 (diff) | |
download | opie-fffd954b4ea3c124a37cab9af99b248986029436.zip opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.gz opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.bz2 |
- oops, buttonType is a bad name for a variable, given its redundancy
Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 23acfa3..380c703 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -63,25 +63,25 @@ const char * const skinV_mask_file_names[7] = { | |||
63 | "play","stop","fwd","back","up","down","full" | 63 | "play","stop","fwd","back","up","down","full" |
64 | }; | 64 | }; |
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) | 69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) |
70 | { | 70 | { |
71 | setCaption( tr("OpiePlayer - Video") ); | 71 | setCaption( tr("OpiePlayer - Video") ); |
72 | 72 | ||
73 | Button defaultButton; | 73 | Button defaultButton; |
74 | Button toggleButton = defaultButton; | 74 | Button toggleButton = defaultButton; |
75 | toggleButton.buttonType = ToggleButton; | 75 | toggleButton.type = ToggleButton; |
76 | 76 | ||
77 | buttons.reserve( 7 ); | 77 | buttons.reserve( 7 ); |
78 | buttons.push_back( toggleButton ); // play | 78 | buttons.push_back( toggleButton ); // play |
79 | buttons.push_back( defaultButton ); // stop | 79 | buttons.push_back( defaultButton ); // stop |
80 | buttons.push_back( defaultButton ); // next | 80 | buttons.push_back( defaultButton ); // next |
81 | buttons.push_back( defaultButton ); // previous | 81 | buttons.push_back( defaultButton ); // previous |
82 | buttons.push_back( defaultButton ); // volUp | 82 | buttons.push_back( defaultButton ); // volUp |
83 | buttons.push_back( defaultButton ); // volDown | 83 | buttons.push_back( defaultButton ); // volDown |
84 | buttons.push_back( toggleButton ); //fullscreen | 84 | buttons.push_back( toggleButton ); //fullscreen |
85 | 85 | ||
86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
87 | 87 | ||
@@ -287,25 +287,25 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
287 | case VideoVolDown: | 287 | case VideoVolDown: |
288 | emit lessClicked(); | 288 | emit lessClicked(); |
289 | return; | 289 | return; |
290 | } | 290 | } |
291 | } else if ( !isOnButton && buttons[i].isHeld ) { | 291 | } else if ( !isOnButton && buttons[i].isHeld ) { |
292 | buttons[i].isHeld = FALSE; | 292 | buttons[i].isHeld = FALSE; |
293 | toggleButton(i); | 293 | toggleButton(i); |
294 | } | 294 | } |
295 | } else { | 295 | } else { |
296 | 296 | ||
297 | if ( buttons[i].isHeld ) { | 297 | if ( buttons[i].isHeld ) { |
298 | buttons[i].isHeld = FALSE; | 298 | buttons[i].isHeld = FALSE; |
299 | if ( buttons[i].buttonType != ToggleButton ) { | 299 | if ( buttons[i].type != ToggleButton ) { |
300 | setToggleButton( i, FALSE ); | 300 | setToggleButton( i, FALSE ); |
301 | } | 301 | } |
302 | 302 | ||
303 | switch(i) { | 303 | switch(i) { |
304 | 304 | ||
305 | case VideoPlay: { | 305 | case VideoPlay: { |
306 | if( mediaPlayerState.isPaused() ) { | 306 | if( mediaPlayerState.isPaused() ) { |
307 | setToggleButton( i, FALSE ); | 307 | setToggleButton( i, FALSE ); |
308 | mediaPlayerState.setPaused( FALSE ); | 308 | mediaPlayerState.setPaused( FALSE ); |
309 | return; | 309 | return; |
310 | } else if( !mediaPlayerState.isPaused() ) { | 310 | } else if( !mediaPlayerState.isPaused() ) { |
311 | setToggleButton( i, TRUE ); | 311 | setToggleButton( i, TRUE ); |