Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 102222
Collapse All | Expand All

(-)mplayerplug-in/Source/plugin-setup.cpp.orig (-6 / +30 lines)
Lines 9-14 Link Here
9
int enable_mpeg;
9
int enable_mpeg;
10
int enable_ogg;
10
int enable_ogg;
11
int enable_smil;
11
int enable_smil;
12
int enable_audio;
12
13
13
#define MAX_BUF_LEN 255
14
#define MAX_BUF_LEN 255
14
#define STATE_RESET 0
15
#define STATE_RESET 0
Lines 53-58 Link Here
53
    enable_mpeg = 1;
54
    enable_mpeg = 1;
54
    enable_ogg = 1;
55
    enable_ogg = 1;
55
    enable_smil = 1;
56
    enable_smil = 1;
57
    enable_audio = 1;
56
    use_custom_mime_types = 0;
58
    use_custom_mime_types = 0;
57
59
58
    DEBUG = 0;			//set to 1 when debugging this function
60
    DEBUG = 0;			//set to 1 when debugging this function
Lines 133-138 Link Here
133
		    printf("mpeg:%i\n", enable_mpeg);
135
		    printf("mpeg:%i\n", enable_mpeg);
134
		continue;
136
		continue;
135
	    }
137
	    }
138
	    // Audio Files
139
	    if (strncasecmp(buffer, "enable-audio", 11) == 0) {
140
		snprintf(parse, 1000, "%s", strtok(buffer, "="));
141
		snprintf(parse, 1000, "%s", strtok(NULL, "="));
142
		sscanf(parse, "%i", &enable_audio);
143
		if (DEBUG)
144
		    printf("mpeg:%i\n", enable_audio);
145
		continue;
146
	    }
136
	    // Ogg Vorbis
147
	    // Ogg Vorbis
137
	    if (strncasecmp(buffer, "enable-ogg", 11) == 0) {
148
	    if (strncasecmp(buffer, "enable-ogg", 11) == 0) {
138
		snprintf(parse, 1000, "%s", strtok(buffer, "="));
149
		snprintf(parse, 1000, "%s", strtok(buffer, "="));
Lines 209-230 Link Here
209
		    "video/x-ms-wmv:wmv:Microsoft WMV video;"
220
		    "video/x-ms-wmv:wmv:Microsoft WMV video;"
210
		    "video/x-ms-wmp:wmp:Windows Media;"
221
		    "video/x-ms-wmp:wmp:Windows Media;"
211
		    "video/x-ms-wvx:wvx:Windows Media;"
222
		    "video/x-ms-wvx:wvx:Windows Media;"
223
		    "application/x-drm-v2:asx:Windows Media;",
224
		    sizeof(MimeTypes));
225
	    if (enable_audio == 1) {
226
		strlcat(MimeTypes,
212
		    "audio/x-ms-wax:wax:Windows Media;"
227
		    "audio/x-ms-wax:wax:Windows Media;"
213
		    "audio/x-ms-wma:wma:Windows Media;"
228
		    "audio/x-ms-wma:wma:Windows Media;"
214
		    "application/x-drm-v2:asx:Windows Media;"
215
		    "audio/wav:wav:Microsoft wave file;"
229
		    "audio/wav:wav:Microsoft wave file;"
216
		    "audio/x-wav:wav:Microsoft wave file;",
230
		    "audio/x-wav:wav:Microsoft wave file;",
217
		    sizeof(MimeTypes));
231
		    sizeof(MimeTypes));
218
	}
232
	}
233
	}
219
234
220
235
221
	if (enable_real == 1) {
236
	if (enable_real == 1) {
222
	    strlcat(MimeTypes,
237
	    strlcat(MimeTypes,
238
		    "application/smil:smil:SMIL;", sizeof(MimeTypes));
239
	    if (enable_audio == 1) {
240
		strlcat(MimeTypes,
223
		    "audio/x-pn-realaudio:ram,rm:RealAudio;"
241
		    "audio/x-pn-realaudio:ram,rm:RealAudio;"
224
		    "audio/x-pn-realaudio-plugin:rpm:RealAudio;"
242
		    "audio/x-pn-realaudio-plugin:rpm:RealAudio;"
225
		    "application/smil:smil:SMIL;"
226
		    "audio/x-realaudio:ra:RealAudio;", sizeof(MimeTypes));
243
		    "audio/x-realaudio:ra:RealAudio;", sizeof(MimeTypes));
227
	}
244
	}
245
	}
228
246
229
	if (enable_real == 0 && enable_qt == 1) {
247
	if (enable_real == 0 && enable_qt == 1) {
230
	    if (enable_smil == 1)
248
	    if (enable_smil == 1)
Lines 235-259 Link Here
235
	if (enable_mpeg == 1) {
253
	if (enable_mpeg == 1) {
236
	    strlcat(MimeTypes,
254
	    strlcat(MimeTypes,
237
		    "video/mpeg:mpg,mpeg:MPEG;"
255
		    "video/mpeg:mpg,mpeg:MPEG;"
238
		    "audio/mpeg:mpg,mpeg:MPEG;"
239
		    "video/x-mpeg:mpg,mpeg:MPEG;"
256
		    "video/x-mpeg:mpg,mpeg:MPEG;"
240
		    "video/x-mpeg2:mpv2,mp2ve:MPEG2;"
257
		    "video/x-mpeg2:mpv2,mp2ve:MPEG2;"
258
		    "video/mp4:mp4:MPEG 4 Video;", sizeof(MimeTypes));
259
	    if (enable_audio == 1) {
260
		    strlcat(MimeTypes,
261
		    "audio/mpeg:mpg,mpeg:MPEG;"
241
		    "audio/mpeg:mpg,mpeg:MPEG;"
262
		    "audio/mpeg:mpg,mpeg:MPEG;"
242
		    "audio/x-mpeg:mpg,mpeg:MPEG;"
263
		    "audio/x-mpeg:mpg,mpeg:MPEG;"
243
		    "audio/mpeg2:mp2:MPEG audio;"
264
		    "audio/mpeg2:mp2:MPEG audio;"
244
		    "audio/x-mpeg2:mp2:MPEG audio;"
265
		    "audio/x-mpeg2:mp2:MPEG audio;"
245
		    "audio/mpeg3:mp3:MPEG audio;"
266
		    "audio/mpeg3:mp3:MPEG audio;"
246
		    "audio/x-mpeg3:mp3:MPEG audio;"
267
		    "audio/x-mpeg3:mp3:MPEG audio;"
247
		    "audio/mp3:mp3:MPEG audio;"
268
		    "audio/mp3:mp3:MPEG audio;", sizeof(MimeTypes));
248
		    "video/mp4:mp4:MPEG 4 Video;", sizeof(MimeTypes));
269
	    }
249
	}
270
	}
250
271
251
	if (enable_ogg == 1) {
272
	if (enable_ogg == 1) {
252
	    strlcat(MimeTypes,
273
	    strlcat(MimeTypes,
253
		    "application/x-ogg:ogg:Ogg Vorbis Media;"
274
		    "application/x-ogg:ogg:Ogg Vorbis Media;"
254
		    "audio/ogg:ogg:Ogg Vorbis Audio;"
255
		    "application/ogg:ogg:Ogg Vorbis / Ogg Theora;",
275
		    "application/ogg:ogg:Ogg Vorbis / Ogg Theora;",
256
		    sizeof(MimeTypes));
276
		    sizeof(MimeTypes));
277
	    if (enable_audio == 1) {
278
		    strlcat(MimeTypes,
279
		    "audio/ogg:ogg:Ogg Vorbis Audio;", sizeof(MimeTypes));
280
	    }
257
	}
281
	}
258
	// FLI
282
	// FLI
259
	strlcat(MimeTypes,
283
	strlcat(MimeTypes,

Return to bug 102222