Mercurial > audlegacy
comparison src/audacious/main.c @ 2512:3a1fc6f7c187 trunk
[svn] - unbreak relative path support. closes #791.
author | nenolod |
---|---|
date | Mon, 12 Feb 2007 14:26:29 -0800 |
parents | 630910fd140f |
children | 7c6ce705adda |
comparison
equal
deleted
inserted
replaced
2511:0197fb284f79 | 2512:3a1fc6f7c187 |
---|---|
869 gint pos = 0; | 869 gint pos = 0; |
870 gint i = 0; | 870 gint i = 0; |
871 | 871 |
872 for (i = 0; filenames[i] != NULL; i++) | 872 for (i = 0; filenames[i] != NULL; i++) |
873 { | 873 { |
874 gchar *filename; | |
875 gchar *current_dir = g_get_current_dir(); | |
876 | |
877 if (filenames[i][0] == '/' || strstr(filenames[i], "://")) | |
878 filename = g_strdup(filenames[i]); | |
879 else | |
880 filename = g_build_filename(current_dir, filenames[i], NULL); | |
881 | |
874 if (options->load_skins) | 882 if (options->load_skins) |
875 { | 883 { |
876 xmms_remote_set_skin(session, filenames[i]); | 884 xmms_remote_set_skin(session, filename); |
877 skin_install_skin(filenames[i]); | 885 skin_install_skin(filename); |
878 } | 886 } |
879 else | 887 else |
880 { | 888 { |
881 if (options->enqueue_to_temp) | 889 if (options->enqueue_to_temp) |
882 xmms_remote_playlist_enqueue_to_temp(session, filenames[i]); | 890 xmms_remote_playlist_enqueue_to_temp(session, filename); |
883 | 891 |
884 if (options->enqueue && options->play) | 892 if (options->enqueue && options->play) |
885 pos = xmms_remote_get_playlist_length(session); | 893 pos = xmms_remote_get_playlist_length(session); |
886 | 894 |
887 if (!options->enqueue) | 895 if (!options->enqueue) |
888 xmms_remote_playlist_clear(session); | 896 xmms_remote_playlist_clear(session); |
889 | 897 |
890 xmms_remote_playlist_add_url_string(session, filenames[i]); | 898 xmms_remote_playlist_add_url_string(session, filename); |
891 | 899 |
892 if (options->enqueue && options->play && | 900 if (options->enqueue && options->play && |
893 xmms_remote_get_playlist_length(session) > pos) | 901 xmms_remote_get_playlist_length(session) > pos) |
894 xmms_remote_set_playlist_pos(session, pos); | 902 xmms_remote_set_playlist_pos(session, pos); |
895 | 903 |
896 if (!options->enqueue) | 904 if (!options->enqueue) |
897 xmms_remote_play(session); | 905 xmms_remote_play(session); |
898 } | 906 } |
907 | |
908 g_free(filename); | |
909 g_free(current_dir); | |
899 } | 910 } |
900 | 911 |
901 g_strfreev(filenames); | 912 g_strfreev(filenames); |
902 } | 913 } |
903 | 914 |