gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch reviewed by _vicious_

Browse source 
Fri May  4 19:12:55 2001  Jonathan Blandford  <jrb@webwynk.net>

	* src/file-manager/fm-icon-view.c
	(icon_container_preview_callback): Possibly play the file if it's
	an ogg.

	* src/file-manager/fm-icon-view.c (play_file): Check for ogg
	file.
This commit is contained in:
Jonathan Blandford 2001-05-04 23:13:54 +00:00 committed by Jonathan Blandford
parent 6ba9da9a37
commit 62c02ef4fe
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri May 4 19:12:55 2001 Jonathan Blandford <jrb@webwynk.net>
* src/file-manager/fm-icon-view.c
(icon_container_preview_callback): Possibly play the file if it's
an ogg.
* src/file-manager/fm-icon-view.c (play_file): Check for ogg
file.
2001-05-04 Darin Adler <darin@eazel.com>
* nautilus-installer.spec.in: Removed this obsolete file.

11
src/file-manager/fm-icon-view.c
View file

@ -1550,6 +1550,7 @@ play_file (gpointer callback_data)
char *file_uri;
char *file_path, *mime_type;
gboolean is_mp3;
gboolean is_ogg;
pid_t mp3_pid;
file = NAUTILUS_FILE (callback_data);
@ -1557,7 +1558,8 @@ play_file (gpointer callback_data)
file_path = gnome_vfs_get_local_path_from_uri (file_uri);
mime_type = nautilus_file_get_mime_type (file);
is_mp3 = eel_strcasecmp (mime_type, "audio/x-mp3") == 0;
is_ogg = eel_strcasecmp (mime_type, "application/x-ogg") == 0;
if (file_path != NULL) {
mp3_pid = fork ();
if (mp3_pid == (pid_t) 0) {
@ -1565,6 +1567,8 @@ play_file (gpointer callback_data)
setsid();
if (is_mp3) {
execlp ("mpg123", "mpg123", "-y", "-q", file_path, NULL);
} else if (is_ogg) {
execlp ("ogg123", "ogg123", "-q", file_path, NULL);
} else {
execlp ("play", "play", file_path, NULL);
}
@ -1683,8 +1687,9 @@ icon_container_preview_callback (NautilusIconContainer *container,
/* at first, we just handle sounds */
if (should_preview_sound (file)) {
mime_type = nautilus_file_get_mime_type (file);
if (eel_istr_has_prefix (mime_type, "audio/") &&
eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0) {
if ((eel_istr_has_prefix (mime_type, "audio/") ||
eel_istr_has_prefix (mime_type, "application/x-ogg")) &&
eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0) {
if (nautilus_sound_can_play_sound ()) {
result = 1;
preview_audio (icon_view, file, start_flag);