From fcecf181c8410575ebb2f6c0f3e5820991ed73cc Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 2 Jan 2004 11:30:03 +0000 Subject: Fix build with gcc3. --- audio/musicbox/patches/patch-ac | 102 ++++++++++++++++++++++++++++++++++++---- audio/musicbox/patches/patch-ad | 28 +++++++++-- audio/musicbox/patches/patch-ag | 28 +++++++++++ audio/musicbox/patches/patch-ah | 13 +++++ audio/musicbox/patches/patch-ai | 22 +++++++++ 5 files changed, 180 insertions(+), 13 deletions(-) create mode 100644 audio/musicbox/patches/patch-ag create mode 100644 audio/musicbox/patches/patch-ah create mode 100644 audio/musicbox/patches/patch-ai (limited to 'audio/musicbox/patches') diff --git a/audio/musicbox/patches/patch-ac b/audio/musicbox/patches/patch-ac index fed9584c889..145d5f96177 100644 --- a/audio/musicbox/patches/patch-ac +++ b/audio/musicbox/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ +$NetBSD: patch-ac,v 1.2 2004/01/02 11:30:03 jmmv Exp $ ---- player.cpp.orig Thu Oct 1 10:00:23 1998 -+++ player.cpp Wed Jun 9 00:56:30 1999 -@@ -72,7 +72,7 @@ +--- 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 ); @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ options->setCheckable(TRUE); menubar->insertItem( "&Options",options ); menubar->insertSeparator(); -@@ -150,7 +150,7 @@ +@@ -150,7 +150,7 @@ PlayerWidget::PlayerWidget( QWidget *par QLabel *label; label = new QLabel( this ); @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ label->setGeometry(5,133,125,30); edtName = new QLabel( this ); -@@ -158,7 +158,7 @@ +@@ -158,7 +158,7 @@ PlayerWidget::PlayerWidget( QWidget *par edtName->setGeometry(83,136,100,25); label = new QLabel( this ); @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ label->setGeometry(5,173,125,30); edtAlbum = new QLabel( this ); -@@ -166,7 +166,7 @@ +@@ -166,7 +166,7 @@ PlayerWidget::PlayerWidget( QWidget *par edtAlbum->setGeometry(83,176,100,25); label = new QLabel( this ); @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ label->setGeometry(5,213,125,30); edtPub = new QLabel( this ); -@@ -242,15 +242,13 @@ +@@ -242,15 +242,13 @@ void PlayerWidget::GoPlay() song->setText(SongBox->text(SongBox->currentItem())); dclock->Start(SongBox->currentItem()); if ((mp3_pid = fork()) == 0 ){ @@ -60,3 +60,89 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ } } } +@@ -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); diff --git a/audio/musicbox/patches/patch-ad b/audio/musicbox/patches/patch-ad index 3ff0e0e18e7..155edb45a97 100644 --- a/audio/musicbox/patches/patch-ad +++ b/audio/musicbox/patches/patch-ad @@ -1,8 +1,26 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ +$NetBSD: patch-ad,v 1.2 2004/01/02 11:30:03 jmmv Exp $ ---- ListView.cpp.orig Wed Feb 17 09:17:11 1999 -+++ ListView.cpp Wed Feb 17 09:21:00 1999 -@@ -383,11 +383,11 @@ +--- ListView.cpp.orig 1997-11-16 14:58:42.000000000 +0100 ++++ ListView.cpp +@@ -67,7 +67,7 @@ AlbumItem& AlbumItem::operator=(const Al + return *this; + } + +-AlbumListBox::AlbumListBox(QWidget* parent=0, const char* name=0) ++AlbumListBox::AlbumListBox(QWidget* parent, const char* name) + :MultiListBox(parent,(char *)name) + { + ptr.setAutoDelete(TRUE); +@@ -365,7 +365,7 @@ int Mixer::Set(int l) + return(1); + } + +-AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent=0) ++AlbumInfoView::AlbumInfoView(AlbumItem *item,int i,QWidget *parent) + :QDialog(parent,"Info",TRUE) + { + QLabel *lbl; +@@ -383,11 +383,11 @@ AlbumInfoView::AlbumInfoView(AlbumItem * if (item != NULL) temp = item; @@ -17,7 +35,7 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/06/08 23:07:11 tron Exp $ topLayout->addWidget(lbl,2,0); Title = new QLabel(this); -@@ -412,7 +412,7 @@ +@@ -412,7 +412,7 @@ AlbumInfoView::AlbumInfoView(AlbumItem * connect(btn,SIGNAL(clicked()),this,SLOT(RemoveSong())); topLayout->addWidget(btn,4,1); diff --git a/audio/musicbox/patches/patch-ag b/audio/musicbox/patches/patch-ag new file mode 100644 index 00000000000..027fa224468 --- /dev/null +++ b/audio/musicbox/patches/patch-ag @@ -0,0 +1,28 @@ +$NetBSD: patch-ag,v 1.1 2004/01/02 11:30:03 jmmv Exp $ + +--- filebrowse.cpp.orig 1998-10-01 09:51:07.000000000 +0200 ++++ filebrowse.cpp +@@ -5,7 +5,7 @@ + #include + #include "filebrowse.h" + +-FileBrowseView::FileBrowseView(QWidget *parent=0,char *filter="*.mp3",char *name=0) ++FileBrowseView::FileBrowseView(QWidget *parent,char *filter,char *name) + :QDialog(parent,"browse",TRUE) + { + setCaption("Browse Files"); +@@ -99,12 +99,12 @@ QStrList FileBrowseView::GetSongList() + return NULL; + } + +-MyOpenFile::MyOpenFile(QWidget *parent=0,char *name=0) ++MyOpenFile::MyOpenFile(QWidget *parent,char *name) + :QDialog(parent,"open",TRUE) + { + } + +-QString MyOpenFile::getOpenFileName(QWidget *parent=0,char *filter="*.*") ++QString MyOpenFile::getOpenFileName(QWidget *parent,char *filter) + { + QDialog *dg = new QDialog(parent,"open",TRUE); + dg->setCaption("Open File"); diff --git a/audio/musicbox/patches/patch-ah b/audio/musicbox/patches/patch-ah new file mode 100644 index 00000000000..00addae00a9 --- /dev/null +++ b/audio/musicbox/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2004/01/02 11:30:03 jmmv Exp $ + +--- diskbrowse.cpp.orig 1998-08-15 17:31:22.000000000 +0200 ++++ diskbrowse.cpp +@@ -2,7 +2,7 @@ + #include "diskbrowse.res" + + DiskBrowser::DiskBrowser(QWidget *parent, +- const char *filter="*", ++ const char *filter, + const char *name, + WFlags f) : + QWidget(parent, name, f) diff --git a/audio/musicbox/patches/patch-ai b/audio/musicbox/patches/patch-ai new file mode 100644 index 00000000000..38efdb29179 --- /dev/null +++ b/audio/musicbox/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2004/01/02 11:30:03 jmmv Exp $ + +--- MultiListBox.cpp.orig 1997-11-14 06:15:56.000000000 +0100 ++++ MultiListBox.cpp +@@ -6,7 +6,7 @@ + // MultiListBox Implement + // written by mills + +-MultiListBox::MultiListBox(QWidget *parent=0,char *name=0,int numCols=4) ++MultiListBox::MultiListBox(QWidget *parent,char *name,int numCols) + :QTableView(parent,name) + { + ItemList.setAutoDelete(TRUE); +@@ -230,7 +230,7 @@ int MultiListBoxItem::Height(MultiListBo + return result + 20 ; + } + +-void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag=0) ++void MultiListBoxItem::Paint(QPainter *p, int max_w, int max_h,int flag) + { + int base_h = Pic.height(); + int pos_x,pos_y; -- cgit v1.2.3