head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.12 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.8 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.6 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.4 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.2 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2008.09.16.16.07.31; author wiz; state dead; branches; next 1.2; 1.2 date 2004.01.02.11.30.03; author jmmv; state Exp; branches; next 1.1; 1.1 date 99.06.08.23.07.11; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.06.08.23.07.11; author tron; state Exp; branches; next ; desc @@ 1.3 log @Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users on Sep 7 2008. No complaints received. @ text @$NetBSD: patch-ac,v 1.2 2004/01/02 11:30:03 jmmv Exp $ --- player.cpp.orig 1998-10-01 10:00:23.000000000 +0200 +++ player.cpp @@@@ -72,7 +72,7 @@@@ PlayerWidget::PlayerWidget( QWidget *par options = new QPopupMenu; AutoPlayID = options->insertItem( "&Auto Play", this, SLOT(AutoPlay()) ); options->setItemChecked( AutoPlayID, isAutoPlay ); - RepeatID = options->insertItem( "Re&peat", this, SLOT(RepeatPlay()) ); + RepeatID = options->insertItem( "&Repeat", this, SLOT(RepeatPlay()) ); options->setCheckable(TRUE); menubar->insertItem( "&Options",options ); menubar->insertSeparator(); @@@@ -150,7 +150,7 @@@@ PlayerWidget::PlayerWidget( QWidget *par QLabel *label; label = new QLabel( this ); - label->setText("歌星:"); + label->setText("Artist:"); label->setGeometry(5,133,125,30); edtName = new QLabel( this ); @@@@ -158,7 +158,7 @@@@ PlayerWidget::PlayerWidget( QWidget *par edtName->setGeometry(83,136,100,25); label = new QLabel( this ); - label->setText("專輯名稱:"); + label->setText("Album:"); label->setGeometry(5,173,125,30); edtAlbum = new QLabel( this ); @@@@ -166,7 +166,7 @@@@ PlayerWidget::PlayerWidget( QWidget *par edtAlbum->setGeometry(83,176,100,25); label = new QLabel( this ); - label->setText("發行公司:"); + label->setText("Company:"); label->setGeometry(5,213,125,30); edtPub = new QLabel( this ); @@@@ -242,15 +242,13 @@@@ void PlayerWidget::GoPlay() song->setText(SongBox->text(SongBox->currentItem())); dclock->Start(SongBox->currentItem()); if ((mp3_pid = fork()) == 0 ){ - char **argv; - int i; - argv[0]=MP3_PLAYER; - argv[1]="-q"; - argv[2]=(char *)LocBox->text(SongBox->currentItem()); - argv[3]=NULL; - execvp(MP3_PLAYER,argv); + execlp(MP3_PLAYER, + MP3_PLAYER, + "-q", + (char *)LocBox->text(SongBox->currentItem()), + NULL); QMessageBox::warning(this,"error","can't exec mpg123\n"); - exit(1); + _exit(1); } } } @@@@ -359,46 +357,45 @@@@ void PlayerWidget::OpenFiles() void PlayerWidget::Usage() { - char help_txt[] = " -1. Menu:\n -1.1 File\n - New Album - Create an new Album for playing later. - Open Files - Select some mp3 files you like, and play them - in sequence. - Save - Save all album in the right frame to file. - Quit - Quit MusicBox.\n -1.2 View\n - Small Panel - view controls only. - Normal Panel - view controls and song list. - Completed Panel - view all frames.\n -1.3 Options\n - Auto Play - Auto Play songs after choosing an album or files. - Repeat - Rewind, and play them again.\n -1.4 Help\n - Some information about music box\n -2. Albums:\n - Album is a set of songs, you can add name of song to - relative file, and singer, album name, and publisher. - Make it more readable.\n - You can choose an icon to represent an album.GIF, - XPM,BMP is supported, The size 48x48 is prefered.\n - If you want to edit album information, click mouse - right-button and click edit.\n -3. Usage:\n - You can choose files to play or play album.\n -*Important*\n - \"mpg123\" package must be installed first before using - MusicBox. -"; + char help_txt[] = +"1. Menu:\n\n" +"1.1 File\n\n" +" New Album\n" +" Create an new Album for playing later.\n" +" Open Files\n" +" Select some mp3 files you like, and play them\n" +" in sequence.\n" +" Save\n" +" Save all album in the right frame to file.\n" +" Quit\n" +" Quit MusicBox.\n\n" +"1.2 View\n\n" +" Small Panel\n" +" view controls only.\n" +" Normal Panel\n" +" view controls and song list.\n" +" Completed Panel\n" +" view all frames.\n\n" +"1.3 Options\n\n" +" Auto Play\n" +" Auto Play songs after choosing an album or files.\n" +" Repeat\n" +" Rewind, and play them again.\n\n" +"1.4 Help\n\n" +" Some information about music box\n\n" +"2. Albums:\n\n" +" Album is a set of songs, you can add name of song to\n" +" relative file, and singer, album name, and publisher.\n" +" Make it more readable.\n\n" +" You can choose an icon to represent an album.GIF,\n" +" XPM,BMP is supported, The size 48x48 is prefered.\n\n" +" If you want to edit album information, click mouse\n" +" right-button and click edit.\n\n" +"3. Usage:\n\n" +" You can choose files to play or play album.\n\n" +"*Important*\n\n" +" \"mpg123\" package must be installed first before using\n" +" MusicBox.\n"; help = new QWidget (0,"help"); QVBoxLayout *toplayout = new QVBoxLayout(help,5); @ 1.2 log @Fix build with gcc3. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- player.cpp.orig Thu Oct 1 10:00:23 1998 +++ player.cpp Wed Jun 9 00:56:30 1999 @@@@ -72,7 +72,7 @@@@ d14 1 a14 1 @@@@ -150,7 +150,7 @@@@ d23 1 a23 1 @@@@ -158,7 +158,7 @@@@ d32 1 a32 1 @@@@ -166,7 +166,7 @@@@ d41 1 a41 1 @@@@ -242,15 +242,13 @@@@ d63 86 @ 1.1.1.1 log @Import new "musicbox" package based on work contributed by Rui-Xiang Guo in PR pkg/7022: a X11 front-interface for mpg123 Thanks to Martin J. Laubach for his help to make this compile with egcs. @ text @@