summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>2000-04-16 03:59:31 +0000
committermycroft <mycroft@pkgsrc.org>2000-04-16 03:59:31 +0000
commitce88ba036d4dd607a9b28502d082fd1b72363636 (patch)
tree8613a3b3ac114b876a126031a4160294148d71ad /audio
parented388aa3c19bf8f1cff61789d990f6c68c6608af (diff)
downloadpkgsrc-ce88ba036d4dd607a9b28502d082fd1b72363636.tar.gz
Fix yet more display problems.
Diffstat (limited to 'audio')
-rw-r--r--audio/emixer/Makefile3
-rw-r--r--audio/emixer/files/patch-sum7
-rw-r--r--audio/emixer/patches/patch-ac26
-rw-r--r--audio/emixer/patches/patch-ad164
-rw-r--r--audio/emixer/patches/patch-ae16
5 files changed, 170 insertions, 46 deletions
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
index 8f24d21e24a..3e43b44c2d0 100644
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/16 02:57:20 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 2000/04/16 03:59:31 mycroft Exp $
#
DISTNAME= emixer-0.05.5
@@ -9,7 +9,6 @@ MASTER_SITES= http://emixer.linuxbox.com/
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://emixer.linuxbox.com/
-DEPENDS+= ncurses>=4.2:../../devel/ncurses
DEPENDS+= mpg123-0.59*:../../audio/mpg123
post-extract:
diff --git a/audio/emixer/files/patch-sum b/audio/emixer/files/patch-sum
index 70a7d296e85..4e2dbe9db95 100644
--- a/audio/emixer/files/patch-sum
+++ b/audio/emixer/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/04/16 02:57:21 mycroft Exp $
+$NetBSD: patch-sum,v 1.3 2000/04/16 03:59:32 mycroft Exp $
MD5 (patch-aa) = 35be17da885908004a97f5df45aa6752
MD5 (patch-ab) = f25b4f123fa22bd9a323a41cfa69ac9e
-MD5 (patch-ac) = 1030c1e8ee2c53c15f65724f6ef1f44b
-MD5 (patch-ad) = 59d2401bf9ee5f80ec40ac2cda28fdff
+MD5 (patch-ac) = 5584a60f491c682a92c286ebeead68ba
+MD5 (patch-ad) = 5011600d2e74e170dbde9c80a2446464
+MD5 (patch-ae) = b4bbb0d637aaa4143fc8c99402668122
diff --git a/audio/emixer/patches/patch-ac b/audio/emixer/patches/patch-ac
index 42f1e70a373..caa2cb8fc68 100644
--- a/audio/emixer/patches/patch-ac
+++ b/audio/emixer/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2000/04/16 02:57:22 mycroft Exp $
+$NetBSD: patch-ac,v 1.2 2000/04/16 03:59:32 mycroft Exp $
---- nctgui.c.orig Sun Dec 5 21:41:42 1999
-+++ nctgui.c Sat Apr 15 22:41:06 2000
+--- nctgui.c.orig Fri Jan 28 11:30:52 2000
++++ nctgui.c Sat Apr 15 23:53:35 2000
@@ -30,7 +30,10 @@
void ncurses_init(void)
{
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.1 2000/04/16 02:57:22 mycroft Exp $
- curs_set(0);
+ cbreak();
+ noecho();
-+ //nodelay(stdscr,TRUE);
++ timeout(2);
+ keypad(stdscr,TRUE);
}/* ncurses_init */
@@ -64,22 +64,26 @@ $NetBSD: patch-ac,v 1.1 2000/04/16 02:57:22 mycroft Exp $
box(subWn,0,0);
wrefresh(subWn);
} /* display_menu */
-@@ -127,6 +129,7 @@
+@@ -127,7 +129,8 @@
switch(active_channel)
{
case CHANNEL_1:
+- wbkgd(chWin,COLOR_PAIR(11)|A_BOLD);
+ wattrset(chWin,COLOR_PAIR(11)|A_BOLD|A_ALTCHARSET);
- wbkgd(chWin,COLOR_PAIR(11)|A_BOLD);
++ wbkgdset(chWin,COLOR_PAIR(11)|A_BOLD);
box(chWin,0,0);
wmove(chWin,0,2);
-@@ -137,6 +140,7 @@
+ wattrset(chWin,COLOR_PAIR(5)|A_BOLD|A_BLINK);
+@@ -137,7 +140,8 @@
break;
case CHANNEL_2:
+- wbkgd(chWin,COLOR_PAIR(12)|A_BOLD);
+ wattrset(chWin,COLOR_PAIR(12)|A_BOLD|A_ALTCHARSET);
- wbkgd(chWin,COLOR_PAIR(12)|A_BOLD);
++ wbkgdset(chWin,COLOR_PAIR(12)|A_BOLD);
box(chWin,0,0);
wmove(chWin,0,width-13);
+ wattrset(chWin,COLOR_PAIR(6)|A_BOLD|A_BLINK);
@@ -155,6 +159,7 @@
int centre, j;
@@ -105,14 +109,14 @@ $NetBSD: patch-ac,v 1.1 2000/04/16 02:57:22 mycroft Exp $
box(speedWin,0,0);
if(bar==SPDBAR)mvwaddstr(speedWin,maxY-1,maxX-9,"[Active]");
@@ -323,6 +330,7 @@
- void display_player_status(int sim_play, int cont_play)
+ void display_player_status(int sim_play, int playmode)
{
+ wattrset(pStatusWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
wbkgd(pStatusWin,COLOR_PAIR(1)|A_BOLD);
box(pStatusWin,0,0);
wattrset(pStatusWin,COLOR_PAIR(9)|A_BOLD);
-@@ -341,54 +349,6 @@
+@@ -343,54 +351,6 @@
exit(0);
} /*gui_exit/*/
@@ -167,7 +171,7 @@ $NetBSD: patch-ac,v 1.1 2000/04/16 02:57:22 mycroft Exp $
void create_windows()
{
int maxY, maxX, height, width, origY=1, origX=0;
-@@ -396,10 +356,7 @@
+@@ -398,10 +358,7 @@
getmaxyx(stdscr,maxY,maxX);
height = maxY-4; width = (maxX/10)*7;
chWin = newwin(height,width,origY,origX);
diff --git a/audio/emixer/patches/patch-ad b/audio/emixer/patches/patch-ad
index d0b8031388b..6238a722794 100644
--- a/audio/emixer/patches/patch-ad
+++ b/audio/emixer/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
+$NetBSD: patch-ad,v 1.2 2000/04/16 03:59:32 mycroft Exp $
--- main.c.orig Tue Jan 25 19:11:56 2000
-+++ main.c Sat Apr 15 22:49:36 2000
++++ main.c Sat Apr 15 23:51:57 2000
@@ -115,8 +115,6 @@
menus_active = FALSE;
@@ -11,16 +11,42 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
ncurses_init();
set_ncurses_color_schemes();
create_windows();
-@@ -131,7 +129,7 @@
- display_ch_window(active_channel);
- display_track_path(active_channel,sim_play,ch1_current,ch2_current);
- display_track_status();
+@@ -125,19 +123,9 @@
+ change_channel(&ch1,mp3Path1);
+ change_channel(&ch2,mp3Path2);
+
+-
+ /*display windows*/
+- display_bar(num_menus, menu_name);
+- display_ch_window(active_channel);
+- display_track_path(active_channel,sim_play,ch1_current,ch2_current);
+- display_track_status();
- adjust_display(get_code());
-+ adjust_display(getch());
- display_listdata();
- display_player_status(sim_play,playmode);
- display_volume(ch1_volume_pos,ch2_volume_pos,active_bar);
-@@ -259,9 +257,9 @@
+- display_listdata();
+- display_player_status(sim_play,playmode);
+- display_volume(ch1_volume_pos,ch2_volume_pos,active_bar);
+- display_speed(ch1_speed_pos,ch2_speed_pos,active_bar);
+- display_fader(fader_pos);
+-
++ refresh_windows();
++ display_bar(num_menus,menu_name);
+
+ while(TRUE)
+ {
+@@ -149,9 +137,9 @@
+ if((ch1.end==1)||(ch2.end==1)) display_track_status();
+ if(rcount==5)
+ {
+- refresh_windows();
+- display_bar(num_menus, menu_name);
+- rcount=0;
++ refresh_windows();
++ display_bar(num_menus,menu_name);
++ rcount=0;
+ }
+
+ if(playmode==1) /*loop play*/
+@@ -259,9 +247,9 @@
{
{
display_info(inactive_info);
@@ -32,7 +58,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
vpos=0;
hpos=(hpos>0) ? --hpos: num_menus-1;
display_bar(num_menus, menu_name);
-@@ -270,7 +268,7 @@
+@@ -270,7 +258,7 @@
display_menu(menu_item,num_items);
break;
@@ -41,7 +67,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
vpos=0;
hpos=(hpos<num_menus-1) ? ++hpos: 0;
display_bar(num_menus, menu_name);
-@@ -279,28 +277,27 @@
+@@ -279,28 +267,27 @@
display_menu(menu_item,num_items);
break;
@@ -76,7 +102,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
vpos=0;
menus_active=FALSE;
display_ch_window(active_channel);
-@@ -318,42 +315,41 @@
+@@ -318,42 +305,41 @@
else
{
display_info(inactive_info);
@@ -127,7 +153,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
}
display_listdata();
display_track_path(active_channel,sim_play,ch1_last,ch2_last);
-@@ -472,7 +468,7 @@
+@@ -472,7 +458,7 @@
//printf("------- %i ----------\n",playmode);
break;
@@ -136,7 +162,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if (active_bar==VOLBAR)
{
ch1_volume_pos--;
-@@ -507,7 +503,7 @@
+@@ -507,7 +493,7 @@
break;
@@ -145,7 +171,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if (active_bar==VOLBAR)
{
-@@ -542,7 +538,7 @@
+@@ -542,7 +528,7 @@
}
break;
@@ -154,7 +180,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if (active_bar==VOLBAR)
{
ch2_volume_pos--;
-@@ -574,7 +570,7 @@
+@@ -574,7 +560,7 @@
}
break;
@@ -163,7 +189,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if (active_bar==VOLBAR)
{
ch2_volume_pos++;
-@@ -605,7 +601,7 @@
+@@ -605,7 +591,7 @@
}
break;
@@ -172,7 +198,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
fader_pos-- ;
if(fader_pos<=-(fader_bars/2))fader_pos=-(fader_bars/2);
if(fader_pos == 0)
-@@ -620,7 +616,7 @@
+@@ -620,7 +606,7 @@
display_fader(fader_pos);
break;
@@ -181,7 +207,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
fader_pos++;
if(fader_pos>=(fader_bars/2))fader_pos=(fader_bars/2) ;
if(fader_pos == 0)
-@@ -660,10 +656,10 @@
+@@ -660,10 +646,10 @@
display_fader(fader_pos);
break;
@@ -196,7 +222,20 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
adjust_display(extcode);
display_ch_window(active_channel);
display_listdata();
-@@ -792,7 +788,7 @@
+@@ -671,9 +657,10 @@
+
+ case'r': /*redraws screen*/
+ case'R':
++ clearok(stdscr,TRUE);
+ refresh_windows();
+- display_bar(num_menus, menu_name);
+- break ;
++ display_bar(num_menus,menu_name);
++ break;
+
+ default:
+ for(j=0; j<num_menus; j++)
+@@ -792,7 +779,7 @@
a circular linked list*/
switch(key)
{
@@ -205,7 +244,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if((counter >= height-1)&&(current->fLink!=NULL))
{
top=top->fLink; current=current->fLink;
-@@ -800,7 +796,7 @@
+@@ -800,7 +787,7 @@
else if(current->fLink!=NULL) current=current->fLink;
break;
@@ -214,7 +253,7 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
if((top->bLink!=NULL)&&(top==current))
{
top=top->bLink; current=current->bLink;
-@@ -809,14 +805,14 @@
+@@ -809,14 +796,14 @@
if(current->bLink!=NULL) current=current->bLink ;
break;
@@ -231,7 +270,76 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
while((index < height-1)&(top->bLink!=NULL))
{
top=top->bLink; current=current->bLink; index++;
-@@ -967,24 +963,13 @@
+@@ -884,11 +871,9 @@
+ height1,width1;
+ node *top, *current, *temp;
+
+-
+ if (active_channel==CHANNEL_1)
+ {
+ top=ch1_Head; current=ch1_current;
+-
+ }
+ else if(active_channel==CHANNEL_2)
+ {
+@@ -904,14 +889,11 @@
+ while(temp!=bHead){tracktotal++;temp=temp->fLink;}
+
+ /* display current track number and total tracks */
+- /*wmove(chWin,height1-1,width1-15);*/
+ mvwprintw(chWin,height1-1,width1-15,"[%5i][%5i]",tracknum,tracktotal);
+
+- touchwin(chWin);
+ wrefresh(chWin);
+
+ getmaxyx(subWin,height,width);
+- wbkgd(subWin,COLOR_PAIR(9)|A_BOLD);
+
+ while (top!=NULL)
+ {
+@@ -921,29 +903,34 @@
+ the characters after the last forward slash(/) */
+ songname=strstr(strrchr(fpath,'/'),"/")+1;
+ if(current==top)
++ {
+ if(active_channel==CHANNEL_1)
+ {
+- wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD);
+ wattrset(subWin,COLOR_PAIR(7)|A_BOLD);
++ wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD);
+ }
+ else if(active_channel==CHANNEL_2)
+ {
+- wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD);
+ wattrset(subWin,COLOR_PAIR(8)|A_BOLD);
++ wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD);
+ }
++ }
++ else
++ {
++ wattrset(subWin,COLOR_PAIR(9));
++ wbkgdset(subWin,COLOR_PAIR(9));
++ }
+
+ tempname=strdup(songname);
+ /*shorten song so that it fits in channel/display window*/
+ mvwaddstr(subWin,index,0,tempname); wclrtoeol(subWin);
+ mvwprintw(subWin,index,width-6,"*%5i",playcount);
+-
+- touchwin(subWin);
+- wrefresh(subWin);
+
+- wbkgdset(subWin,COLOR_PAIR(9)|A_BOLD);
+- index++; if(index==height)return;
++ index++; if(index==height)break;
+ top=top->fLink;
+ }
++
++ wrefresh(subWin);
+ } /*display_listdata */
+
+ void menu_action(char *item_name)
+@@ -967,21 +954,10 @@
void exit_prog(void)
{
reset_audio();
@@ -253,8 +361,4 @@ $NetBSD: patch-ad,v 1.1 2000/04/16 02:57:22 mycroft Exp $
-} /* get_code */
void refresh_windows(void)
{
-- erase();refresh();
-+ clearok(stdscr,TRUE);erase();refresh();
- display_ch_window(active_channel);
- display_listdata();
- display_player_status(sim_play,playmode);
+ erase();refresh();
diff --git a/audio/emixer/patches/patch-ae b/audio/emixer/patches/patch-ae
new file mode 100644
index 00000000000..ef7f0ff0983
--- /dev/null
+++ b/audio/emixer/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2000/04/16 03:59:54 mycroft Exp $
+
+--- mixer.c.bak Fri Jan 28 11:29:40 2000
++++ mixer.c Sat Apr 15 23:32:21 2000
+@@ -57,9 +57,9 @@
+ int format;
+ int stereo = 1;
+ int rate = 44100;
+- if ((audio_fd = open("/dev/dsp", O_WRONLY , 0)) == -1)
++ if ((audio_fd = open("/dev/sound", O_WRONLY , 0)) == -1)
+ {
+- perror("/dev/dsp");
++ perror("/dev/sound");
+ return;
+ /*exit(1); */
+ }