changeset 4057:91dabb7c78d2

disabled editing remote tags: 2nd attempt :)
author Eugene Zagidullin <e.asphyx@gmail.com>
date Mon, 03 Dec 2007 02:36:16 +0300
parents e8066e91388a
children 0191b9b4dd35
files src/audacious/playlist.c src/audacious/ui_fileinfo.c
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/playlist.c	Sat Dec 01 01:57:03 2007 +0300
+++ b/src/audacious/playlist.c	Mon Dec 03 02:36:16 2007 +0300
@@ -2464,7 +2464,7 @@
     /* plugin is capable to update tags. we need to bypass tuple cache. --eugene */
     /* maybe code cleanup required... */
     if (entry->decoder != NULL && entry->decoder->update_song_tuple != NULL &&
-        entry->decoder->file_info_box == NULL && path != NULL) {
+        entry->decoder->file_info_box == NULL && path != NULL && !vfs_is_remote(path)) {
 
         fileinfo_show_editor_for_path(path, entry->decoder);
         g_free(path);
--- a/src/audacious/ui_fileinfo.c	Sat Dec 01 01:57:03 2007 +0300
+++ b/src/audacious/ui_fileinfo.c	Mon Dec 03 02:36:16 2007 +0300
@@ -287,7 +287,7 @@
             tuple = tuple_new();
             fd = vfs_fopen(current_file, "r+b");
 
-            if (fd != NULL && !vfs_is_streaming(fd)) {
+            if (fd != NULL) {
                 set_field_str_from_entry(tuple, FIELD_TITLE, entry_title);
                 set_field_str_from_entry(tuple, FIELD_ARTIST, entry_artist);
                 set_field_str_from_entry(tuple, FIELD_ALBUM, entry_album);
@@ -691,8 +691,10 @@
 {
         Tuple *tuple = input_get_song_tuple(path);
 
-        if (tuple == NULL)
-                return input_file_info_box(path);
+        if (tuple == NULL) {
+                input_file_info_box(path);
+                return;
+        }
 
         fileinfo_show_for_tuple(tuple, FALSE);
 
@@ -708,8 +710,10 @@
 
         Tuple *tuple = input_get_song_tuple(path);
 
-        if (tuple == NULL)
-                return input_file_info_box(path);
+        if (tuple == NULL) {
+                input_file_info_box(path);
+                return;
+        }
 
         fileinfo_show_for_tuple(tuple, TRUE);