|
Lines 1-5
Link Here
|
| 1 |
--- src/filetypes.c.orig Wed Jul 13 07:44:46 2005 |
1 |
--- src/filetypes.c.orig Sat Aug 13 02:01:54 2005 |
| 2 |
+++ src/filetypes.c Thu Jul 14 01:59:03 2005 |
2 |
+++ src/filetypes.c Sat Aug 13 15:45:17 2005 |
| 3 |
@@ -97,15 +97,6 @@ |
3 |
@@ -97,15 +97,6 @@ |
| 4 |
return FALSE; |
4 |
return FALSE; |
| 5 |
} |
5 |
} |
|
Lines 16-22
Link Here
|
| 16 |
static void register_file_type(gchar *name, gchar *ext, |
16 |
static void register_file_type(gchar *name, gchar *ext, |
| 17 |
gboolean (*typecheck)(gchar *filename), |
17 |
gboolean (*typecheck)(gchar *filename), |
| 18 |
Chunk *(*load)(gchar *filename, |
18 |
Chunk *(*load)(gchar *filename, |
| 19 |
@@ -922,7 +913,7 @@ |
19 |
@@ -927,7 +918,7 @@ |
| 20 |
b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar); |
20 |
b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar); |
| 21 |
g_free(c); |
21 |
g_free(c); |
| 22 |
if (x != NULL) gtk_object_sink(GTK_OBJECT(x)); |
22 |
if (x != NULL) gtk_object_sink(GTK_OBJECT(x)); |
|
Lines 25-31
Link Here
|
| 25 |
if (b || !file_exists(filename)) { |
25 |
if (b || !file_exists(filename)) { |
| 26 |
*fatal = TRUE; |
26 |
*fatal = TRUE; |
| 27 |
return TRUE; |
27 |
return TRUE; |
| 28 |
@@ -980,7 +971,7 @@ |
28 |
@@ -985,7 +976,7 @@ |
| 29 |
gtk_object_sink(GTK_OBJECT(x)); |
29 |
gtk_object_sink(GTK_OBJECT(x)); |
| 30 |
} |
30 |
} |
| 31 |
} |
31 |
} |
|
Lines 34-36
Link Here
|
| 34 |
if (b || !file_exists(filename)) { |
34 |
if (b || !file_exists(filename)) { |
| 35 |
*fatal = TRUE; |
35 |
*fatal = TRUE; |
| 36 |
return TRUE; |
36 |
return TRUE; |
|
|
37 |
@@ -999,7 +990,11 @@ |
| 38 |
static Chunk *try_mplayer(gchar *filename, int dither_mode, StatusBar *bar) |
| 39 |
{ |
| 40 |
gchar *c,*d; |
| 41 |
- char *tempname; |
| 42 |
+ gchar *tempname; |
| 43 |
+ gchar *argv[] = { "sh", "-c", |
| 44 |
+ "mplayer -quiet -noconsolecontrols " |
| 45 |
+ "-ao \"pcm:file=$OUTFILE\" -vc dummy -vo null " |
| 46 |
+ "\"$INFILE\"", NULL }; |
| 47 |
Chunk *x; |
| 48 |
if (!program_exists("mplayer")) return NULL; |
| 49 |
tempname = get_temp_filename(0); |
| 50 |
@@ -1008,20 +1003,16 @@ |
| 51 |
if (xputenv(c)) { g_free(d); g_free(c); g_free(tempname); return NULL; } |
| 52 |
if (xputenv(d)) { |
| 53 |
g_free(d); |
| 54 |
- if (!xunsetenv("OUTFILE")) |
| 55 |
+ if (!xputenv("OUTFILE")) |
| 56 |
g_free(c); |
| 57 |
g_free(tempname); |
| 58 |
return NULL; |
| 59 |
} |
| 60 |
- char *argv[] = { "sh", "-c", |
| 61 |
- "mplayer -quiet -noconsolecontrols " |
| 62 |
- "-ao \"pcm:file=$OUTFILE\" -vc dummy -vo null " |
| 63 |
- "\"$INFILE\"", NULL }; |
| 64 |
|
| 65 |
x = run_decoder(filename,tempname,"sh",argv,dither_mode,bar); |
| 66 |
|
| 67 |
- if (!xunsetenv("OUTFILE")) g_free(c); |
| 68 |
- if (!xunsetenv("INFILE")) g_free(d); |
| 69 |
+ if (!xputenv("OUTFILE")) g_free(c); |
| 70 |
+ if (!xputenv("INFILE")) g_free(d); |
| 71 |
g_free(tempname); |
| 72 |
|
| 73 |
return x; |