Your message dated Tue, 29 May 2007 02:47:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#413586: fixed in moc 2.5.0~svn20070523-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: moc
Version: 2.4.1-1
Severity: wishlist
Tags: patch
Hi,
the attached patch modifies add_file_plist() to call add_dir_plist() if
the current item is a directory.
Rationale: suppose I'm browsing through directories, if I press 'a' to
add a file/directory, I know wheter is it a file or a directory thus
there's no point in having a distinct command. Moreover a directory can
be seen as a "file of files" :)
thanks,
filippo
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (600, 'unstable'), (1, 'experimental')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17.14-susp2
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages moc depends on:
ii libasoun 1.0.13-2 ALSA library
ii libc6 2.3.6.ds1-13 GNU C Library: Shared libraries
ii libcomer 1.39+1.40-WIP-2006.11.14+dfsg-1 common error description library
ii libcurl3 7.15.5-1 Multi-protocol file transfer libra
ii libflac7 1.1.2-6 Free Lossless Audio Codec - runtim
ii libgnutl 1.4.4-3 the GNU TLS library - runtime libr
ii libid3ta 0.15.1b-10 ID3 tag reading library from the M
ii libidn11 0.6.5-1 GNU libidn library, implementation
ii libjack0 0.101.1-2 JACK Audio Connection Kit (librari
ii libkrb53 1.4.4-7 MIT Kerberos runtime libraries
ii libmad0 0.15.1b-2.1 MPEG audio decoder library
ii libmodpl 1:0.7-5.2 shared libraries for mod music bas
ii libmpcde 1.2.2-1 Musepack (MPC) format library
ii libncurs 5.5-5 Shared libraries for terminal hand
ii libogg0 1.1.3-2 Ogg Bitstream Library
ii libsampl 0.1.2-2 audio rate conversion library
ii libsndfi 1.0.16-1 Library for reading/writing audio
ii libspeex 1.1.12-3 The Speex Speech Codec
ii libstdc+ 4.2-20060923-1 The GNU Standard C++ Library v3
ii libtagc0 1.4-4 TagLib Audio Meta-Data Library (C
ii libvorbi 1.1.2.dfsg-1.2 The Vorbis General Audio Compressi
ii libvorbi 1.1.2.dfsg-1.2 The Vorbis General Audio Compressi
ii zlib1g 1:1.2.3-13 compression library - runtime
moc recommends no packages.
-- no debconf information
--- moc-2.4.1.orig/interface.c 2006-08-30 21:39:09.000000000 +0200
+++ moc-2.4.1/interface.c 2007-03-05 23:45:57.784937752 +0100
@@ -1627,67 +1627,6 @@
set_mixer (get_mixer_value() + diff);
}
-/* Add the currently selected file to the playlist. */
-static void add_file_plist ()
-{
- char *file;
-
- if (iface_in_plist_menu()) {
- error ("Can't add to the playlist a file from the "
- "playlist.");
- return;
- }
-
- if (iface_curritem_get_type() == F_DIR) {
- error ("This is a directory.");
- return;
- }
-
- file = iface_get_curr_file ();
-
- if (!file)
- return;
-
- if (iface_curritem_get_type() != F_SOUND) {
- error ("You can only add a file using this command.");
- free (file);
- return;
- }
-
-
- if (plist_find_fname(playlist, file) == -1) {
- struct plist_item *item = &dir_plist->items[
- plist_find_fname(dir_plist, file)];
-
- send_int_to_srv (CMD_LOCK);
-
- if (options_get_int("SyncPlaylist")) {
- send_int_to_srv (CMD_CLI_PLIST_ADD);
- send_item_to_srv (item);
- }
- else {
- int added;
-
- added = plist_add_from_item (playlist, item);
- iface_add_to_plist (playlist, added);
- }
-
- /* Add to the server's playlist if the server has our
- * playlist */
- if (get_server_plist_serial() == plist_get_serial(playlist)) {
- send_int_to_srv (CMD_LIST_ADD);
- send_str_to_srv (file);
- }
- send_int_to_srv (CMD_UNLOCK);
- }
- else
- error ("The file is already on the playlist.");
-
- iface_menu_key (KEY_CMD_MENU_DOWN);
-
- free (file);
-}
-
/* Recursively add the content of a directory to the playlist. */
static void add_dir_plist ()
{
@@ -1763,6 +1702,67 @@
free (file);
}
+/* Add the currently selected file to the playlist. */
+static void add_file_plist ()
+{
+ char *file;
+
+ if (iface_in_plist_menu()) {
+ error ("Can't add to the playlist a file from the "
+ "playlist.");
+ return;
+ }
+
+ if (iface_curritem_get_type() == F_DIR) {
+ add_dir_plist();
+ return;
+ }
+
+ file = iface_get_curr_file ();
+
+ if (!file)
+ return;
+
+ if (iface_curritem_get_type() != F_SOUND) {
+ error ("You can only add a file using this command.");
+ free (file);
+ return;
+ }
+
+
+ if (plist_find_fname(playlist, file) == -1) {
+ struct plist_item *item = &dir_plist->items[
+ plist_find_fname(dir_plist, file)];
+
+ send_int_to_srv (CMD_LOCK);
+
+ if (options_get_int("SyncPlaylist")) {
+ send_int_to_srv (CMD_CLI_PLIST_ADD);
+ send_item_to_srv (item);
+ }
+ else {
+ int added;
+
+ added = plist_add_from_item (playlist, item);
+ iface_add_to_plist (playlist, added);
+ }
+
+ /* Add to the server's playlist if the server has our
+ * playlist */
+ if (get_server_plist_serial() == plist_get_serial(playlist)) {
+ send_int_to_srv (CMD_LIST_ADD);
+ send_str_to_srv (file);
+ }
+ send_int_to_srv (CMD_UNLOCK);
+ }
+ else
+ error ("The file is already on the playlist.");
+
+ iface_menu_key (KEY_CMD_MENU_DOWN);
+
+ free (file);
+}
+
static void toggle_option (const char *name)
{
send_int_to_srv (CMD_SET_OPTION);
--- End Message ---
--- Begin Message ---
Source: moc
Source-Version: 2.5.0~svn20070523-1
We believe that the bug you reported is fixed in the latest version of
moc, which is due to be installed in the Debian FTP archive:
moc-ffmpeg-plugin_2.5.0~svn20070523-1_i386.deb
to pool/main/m/moc/moc-ffmpeg-plugin_2.5.0~svn20070523-1_i386.deb
moc_2.5.0~svn20070523-1.diff.gz
to pool/main/m/moc/moc_2.5.0~svn20070523-1.diff.gz
moc_2.5.0~svn20070523-1.dsc
to pool/main/m/moc/moc_2.5.0~svn20070523-1.dsc
moc_2.5.0~svn20070523-1_i386.deb
to pool/main/m/moc/moc_2.5.0~svn20070523-1_i386.deb
moc_2.5.0~svn20070523.orig.tar.gz
to pool/main/m/moc/moc_2.5.0~svn20070523.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Elimar Riesebieter <[EMAIL PROTECTED]> (supplier of updated moc package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 28 May 2007 20:04:06 +0200
Source: moc
Binary: moc-ffmpeg-plugin moc
Architecture: source i386
Version: 2.5.0~svn20070523-1
Distribution: unstable
Urgency: low
Maintainer: Elimar Riesebieter <[EMAIL PROTECTED]>
Changed-By: Elimar Riesebieter <[EMAIL PROTECTED]>
Description:
moc - ncurses based console audio player
moc-ffmpeg-plugin - ncurses based console audio player - ffmpeg plugin
Closes: 378795 413586 416102
Changes:
moc (2.5.0~svn20070523-1) unstable; urgency=low
.
* Update to svn HEAD
* Removed Build-Conflicts-Indep: libcurl3-gssapi. Resides in woody and older
versions, so don't needed anymore. Hint by Tony Mancill, thanks.
* "Pressing 'A' in a directory without subdirectories seems...": Fixed
upstream (closes: #416102)
* "mocp crash" in search modus: Fixed upstream (closes: #378795)
* "use 'a' to add a directory as well": Fixed upstream (closes: #413586)
Files:
36657c699a2fd4fa07b356686549ef90 1089 sound optional
moc_2.5.0~svn20070523-1.dsc
bf7dc34819903651fc4b9a8e7d0e52de 251323 sound optional
moc_2.5.0~svn20070523.orig.tar.gz
a8e6c0a489347cc22f2c0630657e9b12 28808 sound optional
moc_2.5.0~svn20070523-1.diff.gz
5cf78dbe97a8d6623a512e1e5425aa16 193346 sound optional
moc_2.5.0~svn20070523-1_i386.deb
cbeb46f535719db865f0fc8314f9c7b5 23614 sound optional
moc-ffmpeg-plugin_2.5.0~svn20070523-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGW5L0pdwBkPlyvgMRArP0AJwN4mvj0WmCDJ/KQOQgDF3pegjl9ACbB5M+
0fCF1AekzgHC5+FilmLC3IU=
=xTRV
-----END PGP SIGNATURE-----
--- End Message ---
