Mercurial > audlegacy

changeset 4886:54b4f7aaca24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- renamed auxiliary files - tweaked libid3tag/Makefile
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 11 Nov 2009 15:34:23 +0900
parents c058fc4d6968
children 0ddbd0025174
files Makefile applications/audacious.desktop.in applications/audlegacy.desktop.in audacious.desktop configure.ac man/Makefile man/audacious.1.in man/audlegacy.1.in pixmaps/Makefile pixmaps/audacious.png pixmaps/audlegacy.png src/libid3tag/Makefile
diffstat 12 files changed, 249 insertions(+), 265 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Sep 16 20:04:27 2009 +0900
+++ b/Makefile	Wed Nov 11 15:34:23 2009 +0900
@@ -227,9 +227,9 @@
 			${INSTALL_FAILED}; \
 		fi; \
 	done
-	for i in audacious.desktop; do \
+	for i in audlegacy.desktop; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 applications/$$i ${DESTDIR}${datadir}/applications/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -249,7 +249,7 @@
 			fi \
 		fi; \
 	done
-	for i in audacious.desktop; do \
+	for i in audlegacy.desktop; do \
 		if test -f ${DESTDIR}${datadir}/applications/$$i; then \
 			if rm -f ${DESTDIR}${datadir}/applications/$$i; then \
 				${DELETE_OK}; \
--- a/applications/audacious.desktop.in	Wed Sep 16 20:04:27 2009 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Audacious
-GenericName=Audio Player
-Comment=Play music
-Comment[hu]=Zene lejátszása
-Exec=audacious %U
-Icon=audacious
-MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg
-Categories=Application;GTK;AudioVideo;Player;
-Terminal=false
-Type=Application
-Encoding=UTF-8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applications/audlegacy.desktop.in	Wed Nov 11 15:34:23 2009 +0900
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Audlegacy
+GenericName=Audio Player
+Comment=Play music
+Comment[hu]=Zene lejátszása
+Comment[de]=Musik abspielen
+Exec=audlegacy %U
+Icon=audlegacy
+MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg
+Categories=Application;GTK;AudioVideo;Player;
+Terminal=false
+Type=Application
+Encoding=UTF-8
--- a/audacious.desktop	Wed Sep 16 20:04:27 2009 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Audacious
-GenericName=Audio Player
-Comment=Play music
-Comment[hu]=Zene lejátszása
-Comment[de]=Musik abspielen
-Exec=audacious %U
-Icon=audacious
-MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg
-Categories=Application;GTK;AudioVideo;Player;
-Terminal=false
-Type=Application
-Encoding=UTF-8
--- a/configure.ac	Wed Sep 16 20:04:27 2009 +0900
+++ b/configure.ac	Wed Nov 11 15:34:23 2009 +0900
@@ -205,7 +205,7 @@
 ### ---------------------------------------------------------------------------
 dnl Session management support
 dnl ==========================
-AS_AC_EXPAND([desktop_file], "${datadir}/applications/audacious2.desktop")
+AS_AC_EXPAND([desktop_file], "${datadir}/applications/audlegacy.desktop")
 AC_DEFINE_UNQUOTED([AUDACIOUS_DESKTOP_FILE], "${desktop_file}", [Location of the desktop file])
 
 AUD_ARG_ENABLE([sm], [yes],
@@ -324,8 +324,8 @@
     buildsys.mk
     extra.mk
     man/audtool.1
-    man/audacious.1
-    applications/audacious.desktop
+    man/audlegacy.1
+    applications/audlegacy.desktop
     po/Makefile.in
 ])
 
--- a/man/Makefile	Wed Sep 16 20:04:27 2009 +0900
+++ b/man/Makefile	Wed Nov 11 15:34:23 2009 +0900
@@ -1,3 +1,3 @@
-MAN = audacious.1 audtool.1
+MAN = audlegacy.1 audtool.1
 
 include ../buildsys.mk
--- a/man/audacious.1.in	Wed Sep 16 20:04:27 2009 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-.TH AUDACIOUS "1" "24 October 2005" "Version @PACKAGE_VERSION@" "Audacious Manual Pages"
-.SH NAME
-Audacious \- an audio player for X.
-.SH SYNOPSIS
-.B audacious
-[\fB\-h\fP] [\fB\-\-help\fP] [\fB\-r\fP]
-[\fB\-\-rew\fP] [\fB\-p\fP] [\fB\-\-play\fP] [\fB\-u\fP] [\fB\-\-pause\fP] [\fB\-s\fP] [\fB\-\-stop\fP] [\fB\-f\fP]
-[\fB\-\-fwd\fP] [\fB\-e\fP] [\fB\-\-enqueue\fP] [\fB\-m\fP] [\fB\-\-show\-main\-window\fP] [\fB\-v\fP]
-[\fB\-\-version\fP] [\fB\-i\fP \fIinterface\fP] [\fB\-\-interface\fP \fIinterface\fP] [\fB\-\-display\fP=\fIDISPLAY\fP] [\fIfilename\fP]...
-.SH DESCRIPTION
-\fIAudacious\fP is a media player, based on Beep Media Player, 
-which is in turn based on the X Multimedia System.
-It is used to play audio and other kinds of media files.  By default
-Audacious can play MPEG audio, Ogg Vorbis, RIFF wav, most module formats,
-and a few other formats.  Audacious can be extended through plugins to play
-a number of other audio and video formats.
-.SH OPTIONS
-Audacious accepts the following options:
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-r, \-\-rew
-Skip backwards in playlist.
-.TP
-.B \-p, \-\-play
-Start playing current playlist.
-.TP
-.B \-u, \-\-pause
-Pause current song.
-.TP
-.B \-s, \-\-stop
-Stop current song.
-.TP
-.B \-t, \-\-play\-pause
-Pause if playing, play otherwise.
-.TP
-.B \-f, \-\-fwd
-Skip forward in playlist.
-.TP
-.B \-e, \-\-enqueue
-Don't clear the playlist.
-.TP
-.B \-m, \-\-show\-main\-window
-Show the main window.
-.TP
-.B \-v, \-\-version
-Print version number and exit.
-.TP
-.B \-i, \-\-interface
-Select interface to use.
-.TP
-.B \-\-display=\fIDISPLAY\fP
-Select X display to use.
-.SH INTERFACES
-Audacious supports multiple interface plugins. Interface plugin determines Audacious look'n'feel.
-
-As for now, you can use following interfaces:
-
-.in +2
-default	Default interface that uses GTK+ widgets
-.br
-skinned	Interface that supports skinned interface
-.br
-legacy	Old (Audacious 1.*) skinned interface
-.br
-headless	Headless mode
-
-.SH SKINS
-Audacious supports Winamp Classic style skins.  Skins may be stored in either
-archived (\fI.zip\fP, \fI.wsz\fP, \fI.tgz\fP, \fI.tar.gz\fP, 
-or \fI.tar.bz2\fP) or unarchived format.  Audacious looks for skinfiles in
-@datarootdir@/audacious/Skins, ~/.local/share/audacious/Skins, and locations specified by the
-\fBSKINSDIR\fP variable.
-.SH KEYBINDINGS
-Global keybindings for Audacious:
-
-.in +2
-.ta \w'Shift + Control + w 'u
-z	Previous song
-.br
-x	Play
-.br
-c	Pause
-.br
-v	Stop
-.br
-b	Next song
-.br
-l	Play file
-.br
-j	Jump to file
-.br
-r	Toggle Repeat
-.br
-s	Toggle Shuffle
-.br
-Shift + l	Play directory
-.br
-Control + l	Play location
-.br
-Control + p	Preferences dialog
-.br
-Control + v	Visualization plugin dialog
-.br
-Control + r	Time remaining
-.br
-Control + a	Always on top
-.br
-Control + w	Winshade mode
-.br
-Control + d	Doublesize mode
-.br
-Control + e	Easy move
-.br
-Control + j	Jump to time
-.br
-Control + z	Start of list
-.br
-Control + n	No Playlist Advance
-.br
-Control + 3	File info dialog
-.br
-Control + Alt + w	Toggle Equalizer winshade mode
-.br
-Shift + Control + w	Playlist winshade mode
-.br
-Alt + w	Hide/show mainwindow
-.br
-Alt + e	Hide/show playlistwindow
-.br
-Alt + g	Hide/show Equalizer
-.br
-Alt + s	Skin selecting window
-.in -2
-
-Main window specific:
-
-.in +2
-.br
-Arrow key up	Volume up 2%
-.br
-Arrow key down	Volume down 2%
-.br
-Arrow key right	Skip 5 seconds forward in song
-.br
-Arrow key left	Skip 5 seconds back in song
-.in -2
-
-Playlist window specific:
-
-.in +2
-.br
-Arrow key up	Up one step in playlist
-.br
-Arrow key down	Down one step in playlist
-.br
-Delete	Remove selected songs from playlist
-.br
-Page Up	Move one page up
-.br
-Page Down	Move one page down
-.br
-Home	First page in playlist
-.br
-End	Last page in playlist
-.br
-Enter	Play selected song
-.br
-Insert	Add file dialog
-.br
-Shift + Insert	Add directory dialog
-.br
-Alt + Insert	Add url dialog
-.in -2 
-
-Equalizer shade mode specific:
-
-.in +2
-.br
-Arrow key up	Volume up 2%
-.br
-Arrow key down	Volume down 2%
-.br
-Arrow key right	Balance 4% to right
-.br
-Arrow key left	Balance 4% to left
-.in -2
-.SH HEADLESS OPERATION
-Audacious supports a headless operation mode, where Audacious does not use
-X11 and instead operates as a daemon. You should note that you cannot switch
-between daemonized mode and X11 mode, and that if you wish to switch back
-and forth, that you need to do so when starting the program.
-
-When using Audacious in headless mode, you will need a client. Clients
-compatible with Audacious are listed on the Audacious website.
-.SH FILES
-.TP
-~/.config/audacious/config
-User's Audacious configuration.
-.TP
-~/.config/audacious/playlist.xspf
-Default playlist usually loaded on startup.
-.TP
-~/.config/audacious/gtkrc 
-User's set of Audacious-specific GTK config settings. Options such as widget
-color and fonts sizes can be set here.
-.TP
-~/.local/share/audacious/Skins, @datarootdir@/audacious/Skins
-Default location(s) where Audacious should look for skinfiles.
-.TP
-~/.local/share/audacious/Plugins
-Location of user-installed plugins.
-.SH ENVIRONMENT
-.TP 12
-.B SKINSDIR
-Colon separated list of paths where Audacious should look for skinfiles.
-.TP
-.B TARCMD
-Tar command supporting GNU tar style decompression.  Used for
-unpacking gzip and bzip2 compressed skins.  Default is \fItar\fP.
-.TP
-.B UNZIPCMD
-Command for decompressing zip files (skins).  Default is \fIunzip\fP.
-.SH OTHER INFO
-The webpage for Audacious is at http://www.audacious-media-player.org.  
-Here you can find info about Audacious, download the latest version, 
-plugins, and skins.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man/audlegacy.1.in	Wed Nov 11 15:34:23 2009 +0900
@@ -0,0 +1,228 @@
+.TH AUDACIOUS "1" "24 October 2005" "Version @PACKAGE_VERSION@" "Audacious Manual Pages"
+.SH NAME
+Audacious \- an audio player for X.
+.SH SYNOPSIS
+.B audacious
+[\fB\-h\fP] [\fB\-\-help\fP] [\fB\-r\fP]
+[\fB\-\-rew\fP] [\fB\-p\fP] [\fB\-\-play\fP] [\fB\-u\fP] [\fB\-\-pause\fP] [\fB\-s\fP] [\fB\-\-stop\fP] [\fB\-f\fP]
+[\fB\-\-fwd\fP] [\fB\-e\fP] [\fB\-\-enqueue\fP] [\fB\-m\fP] [\fB\-\-show\-main\-window\fP] [\fB\-v\fP]
+[\fB\-\-version\fP] [\fB\-i\fP \fIinterface\fP] [\fB\-\-interface\fP \fIinterface\fP] [\fB\-\-display\fP=\fIDISPLAY\fP] [\fIfilename\fP]...
+.SH DESCRIPTION
+\fIAudacious\fP is a media player, based on Beep Media Player, 
+which is in turn based on the X Multimedia System.
+It is used to play audio and other kinds of media files.  By default
+Audacious can play MPEG audio, Ogg Vorbis, RIFF wav, most module formats,
+and a few other formats.  Audacious can be extended through plugins to play
+a number of other audio and video formats.
+.SH OPTIONS
+Audacious accepts the following options:
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-r, \-\-rew
+Skip backwards in playlist.
+.TP
+.B \-p, \-\-play
+Start playing current playlist.
+.TP
+.B \-u, \-\-pause
+Pause current song.
+.TP
+.B \-s, \-\-stop
+Stop current song.
+.TP
+.B \-t, \-\-play\-pause
+Pause if playing, play otherwise.
+.TP
+.B \-f, \-\-fwd
+Skip forward in playlist.
+.TP
+.B \-e, \-\-enqueue
+Don't clear the playlist.
+.TP
+.B \-m, \-\-show\-main\-window
+Show the main window.
+.TP
+.B \-v, \-\-version
+Print version number and exit.
+.TP
+.B \-i, \-\-interface
+Select interface to use.
+.TP
+.B \-\-display=\fIDISPLAY\fP
+Select X display to use.
+.SH INTERFACES
+Audacious supports multiple interface plugins. Interface plugin determines Audacious look'n'feel.
+
+As for now, you can use following interfaces:
+
+.in +2
+default	Default interface that uses GTK+ widgets
+.br
+skinned	Interface that supports skinned interface
+.br
+legacy	Old (Audacious 1.*) skinned interface
+.br
+headless	Headless mode
+
+.SH SKINS
+Audacious supports Winamp Classic style skins.  Skins may be stored in either
+archived (\fI.zip\fP, \fI.wsz\fP, \fI.tgz\fP, \fI.tar.gz\fP, 
+or \fI.tar.bz2\fP) or unarchived format.  Audacious looks for skinfiles in
+@datarootdir@/audacious/Skins, ~/.local/share/audacious/Skins, and locations specified by the
+\fBSKINSDIR\fP variable.
+.SH KEYBINDINGS
+Global keybindings for Audacious:
+
+.in +2
+.ta \w'Shift + Control + w 'u
+z	Previous song
+.br
+x	Play
+.br
+c	Pause
+.br
+v	Stop
+.br
+b	Next song
+.br
+l	Play file
+.br
+j	Jump to file
+.br
+r	Toggle Repeat
+.br
+s	Toggle Shuffle
+.br
+Shift + l	Play directory
+.br
+Control + l	Play location
+.br
+Control + p	Preferences dialog
+.br
+Control + v	Visualization plugin dialog
+.br
+Control + r	Time remaining
+.br
+Control + a	Always on top
+.br
+Control + w	Winshade mode
+.br
+Control + d	Doublesize mode
+.br
+Control + e	Easy move
+.br
+Control + j	Jump to time
+.br
+Control + z	Start of list
+.br
+Control + n	No Playlist Advance
+.br
+Control + 3	File info dialog
+.br
+Control + Alt + w	Toggle Equalizer winshade mode
+.br
+Shift + Control + w	Playlist winshade mode
+.br
+Alt + w	Hide/show mainwindow
+.br
+Alt + e	Hide/show playlistwindow
+.br
+Alt + g	Hide/show Equalizer
+.br
+Alt + s	Skin selecting window
+.in -2
+
+Main window specific:
+
+.in +2
+.br
+Arrow key up	Volume up 2%
+.br
+Arrow key down	Volume down 2%
+.br
+Arrow key right	Skip 5 seconds forward in song
+.br
+Arrow key left	Skip 5 seconds back in song
+.in -2
+
+Playlist window specific:
+
+.in +2
+.br
+Arrow key up	Up one step in playlist
+.br
+Arrow key down	Down one step in playlist
+.br
+Delete	Remove selected songs from playlist
+.br
+Page Up	Move one page up
+.br
+Page Down	Move one page down
+.br
+Home	First page in playlist
+.br
+End	Last page in playlist
+.br
+Enter	Play selected song
+.br
+Insert	Add file dialog
+.br
+Shift + Insert	Add directory dialog
+.br
+Alt + Insert	Add url dialog
+.in -2 
+
+Equalizer shade mode specific:
+
+.in +2
+.br
+Arrow key up	Volume up 2%
+.br
+Arrow key down	Volume down 2%
+.br
+Arrow key right	Balance 4% to right
+.br
+Arrow key left	Balance 4% to left
+.in -2
+.SH HEADLESS OPERATION
+Audacious supports a headless operation mode, where Audacious does not use
+X11 and instead operates as a daemon. You should note that you cannot switch
+between daemonized mode and X11 mode, and that if you wish to switch back
+and forth, that you need to do so when starting the program.
+
+When using Audacious in headless mode, you will need a client. Clients
+compatible with Audacious are listed on the Audacious website.
+.SH FILES
+.TP
+~/.config/audacious/config
+User's Audacious configuration.
+.TP
+~/.config/audacious/playlist.xspf
+Default playlist usually loaded on startup.
+.TP
+~/.config/audacious/gtkrc 
+User's set of Audacious-specific GTK config settings. Options such as widget
+color and fonts sizes can be set here.
+.TP
+~/.local/share/audacious/Skins, @datarootdir@/audacious/Skins
+Default location(s) where Audacious should look for skinfiles.
+.TP
+~/.local/share/audacious/Plugins
+Location of user-installed plugins.
+.SH ENVIRONMENT
+.TP 12
+.B SKINSDIR
+Colon separated list of paths where Audacious should look for skinfiles.
+.TP
+.B TARCMD
+Tar command supporting GNU tar style decompression.  Used for
+unpacking gzip and bzip2 compressed skins.  Default is \fItar\fP.
+.TP
+.B UNZIPCMD
+Command for decompressing zip files (skins).  Default is \fIunzip\fP.
+.SH OTHER INFO
+The webpage for Audacious is at http://www.audacious-media-player.org.  
+Here you can find info about Audacious, download the latest version, 
+plugins, and skins.
--- a/pixmaps/Makefile	Wed Sep 16 20:04:27 2009 +0900
+++ b/pixmaps/Makefile	Wed Nov 11 15:34:23 2009 +0900
@@ -1,4 +1,4 @@
-DATA = audacious.png
+DATA = audlegacy.png
 
 include ../buildsys.mk
 
Binary file pixmaps/audacious.png has changed
Binary file pixmaps/audlegacy.png has changed
--- a/src/libid3tag/Makefile	Wed Sep 16 20:04:27 2009 +0900
+++ b/src/libid3tag/Makefile	Wed Nov 11 15:34:23 2009 +0900
@@ -2,8 +2,6 @@
 LIB_MAJOR = 1
 LIB_MINOR = 0
 
-LIBDIR = ${plugindir}
-
 INCLUDES = id3tag.h
 
 SRCS = compat.c		\
@@ -27,8 +25,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-#includesubdir = audacious
-
 CPPFLAGS += ${LIB_CPPFLAGS} -I.. -I../libSAD ${GLIB_CFLAGS} ${GTK_CFLAGS} \
 	${MOWGLI_CFLAGS} ${LIBMCS_CFLAGS}