summaryrefslogtreecommitdiff
blob: 08d7a692b30001c2f03a7ccc6e786cd43627883f (plain)
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
Index: src/gui-gtk/gtkui.c
===================================================================
--- src/gui-gtk/gtkui.c	(revision 1005)
+++ src/gui-gtk/gtkui.c	(working copy)
@@ -2856,7 +2856,7 @@ static void create_guidlg (void)
 
 static void *gtk_gui_thread (void *dummy)
 {
-    gui_available = 1;
+    create_guidlg ();
     gtk_main ();
 
     gui_available = 0;
@@ -2997,18 +2997,16 @@ int gui_init (int at_start)
     if (gui_available)
 	return 0;
 
+    gui_available = 1;
     if (at_start) {
 	init_comm_pipe (&to_gui_pipe, 20, 1);
 	init_comm_pipe (&from_gui_pipe, 20, 1);
 	uae_sem_init (&gui_sem, 0, 1);
 	uae_sem_init (&gui_init_sem, 0, 0);
 	uae_sem_init (&gui_quit_sem, 0, 0);
-    }
 
-    create_guidlg ();
-    if (at_start)
 	uae_start_thread (gtk_gui_thread, NULL, &tid);
-
+    }
     gui_update ();
 
     if (at_start && currprefs.start_gui == 1) {
Index: src/gui-none/nogui.c
===================================================================
--- src/gui-none/nogui.c	(revision 1005)
+++ src/gui-none/nogui.c	(working copy)
@@ -16,7 +16,7 @@ static void sigchldhandler(int foo)
 {
 }
 
-int gui_init (void)
+int gui_init (int foo)
 {
     return 0;
 }
Index: src/audio.c
===================================================================
--- src/audio.c	(revision 1005)
+++ src/audio.c	(working copy)
@@ -6,6 +6,7 @@
   * Copyright 1995, 1996, 1997 Bernd Schmidt
   * Copyright 1996 Marcus Sundberg
   * Copyright 1996 Manfred Thole
+  * Copyright 2005 Heikki Orsila
   * Copyright 2006 Toni Wilen
   *
   * new filter algorithm and anti&sinc interpolators by Antti S. Lankila
Index: docs/CREDITS
===================================================================
--- docs/CREDITS	(revision 1005)
+++ docs/CREDITS	(working copy)
@@ -64,6 +64,7 @@ Miscellaneous code contributions:
   - Istv�n F�bi�n: helped with disk hardware information
   - Richard Drummond: kept the code base up-to-date in E-UAE when I stopped
     working on UAE on a regular basis.
+  - Heikki Orsila: Sound filter infrastructure.
 
 System specific fixes/ports (some of the fixes for various Unices are no
 longer present, though, since we now use autoconf):