1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
--- ump/UnixShell.c.orig Thu Nov 15 20:47:15 2001
+++ ump/UnixShell.c Thu Nov 15 20:50:37 2001
@@ -38,7 +38,7 @@
/*
** Stuff for the NPP_SetWindow method:
*/
-#ifdef XP_UNIX
+#if 0
#include <X11/Xlib.h> /* Xlib */
#include <X11/Intrinsic.h> /* Xt */
#include <X11/StringDefs.h> /* "callback" */
--- ump/UnixShell.c.orig Fri Feb 15 02:42:28 2002
+++ ump/UnixShell.c Fri Feb 15 02:42:48 2002
@@ -144,8 +144,8 @@
int argc = 0;
argv[argc++] = "timidity";
-#ifdef AU_ALSA
- argv[argc++] = "-Os";
+#ifdef AU_ESD
+ argv[argc++] = "-Oe";
#else
argv[argc++] = "-Od";
#endif
@@ -151,7 +151,7 @@
#endif
if(timid_ump_rate <= 0)
- argv[argc++] = eightKFlag ? "-s8000": "-s22050"; /* check if the user specified 8K rate */
+ argv[argc++] = eightKFlag ? "-s8000": "-s44100"; /* check if the user specified 8K rate */
else
{
sprintf(opt_rate, "-s%d", timid_ump_rate);
@@ -230,7 +230,7 @@
int loop; /* 0 means play only once, non-zero means loop forever */
/* UNIX data members */
-#ifdef XP_UNIX
+#if 0
Widget play, pause, stop, plus, minus; /* button widgets, and their pictures, as well as the logo picture */
Pixmap logoPixmap, playupPixmap, playdnPixmap, pauseupPixmap, pausednPixmap, stopupPixmap, stopdnPixmap, plusupPixmap, plusdnPixmap, minusupPixmap, minusdnPixmap;
Display *display; /* needed for XFreePixmap() */
@@ -344,6 +344,7 @@
This->pid = -1;
This->pipes[1] = -1;
This->pipes[0] = -1;
+#if 0
This->logoPixmap = -1;
This->playupPixmap = -1;
This->playdnPixmap = -1;
@@ -355,6 +356,7 @@
This->plusdnPixmap = -1;
This->minusupPixmap = -1;
This->minusdnPixmap = -1;
+#endif
This->pluginState = PLUGIN_PLAYING;
This->loop = 0;
}
@@ -422,7 +424,7 @@
close(This->pipes[1]);
close(This->pipes[0]);
-#ifdef XP_UNIX
+#if 0
if(This->logoPixmap != -1)XFreePixmap(This->display, This->logoPixmap);
if(This->playupPixmap != -1)XFreePixmap(This->display, This->playupPixmap);
if(This->playdnPixmap != -1)XFreePixmap(This->display, This->playdnPixmap);
@@ -446,6 +448,7 @@
return NPERR_NO_ERROR;
}
+#if 0
/* give buttons the right look for the state of the plugin */
static void setButtons(PluginInstance* This, pluginPlayState state){
@@ -610,6 +613,7 @@
*b = False;
}
+#endif
NPError
@@ -633,7 +637,7 @@
* size changes, etc.
*/
-#ifdef XP_UNIX
+#if 0
{
@@ -1050,6 +1054,7 @@
unuse_UMP(NPN_GetJavaEnv());
}
+#if 0
/* functions for LiveConnect */
static void stopSelectedCallback(XtPointer This, XtIntervalId* id){ stopSelected(NULL, This, NULL); }
@@ -1109,6 +1114,7 @@
(void) XtAppAddTimeOut(XtWidgetToApplicationContext(Ump->stop), 1, minusSelectedCallback, (XtPointer) This);
}
+#endif
|
