Re: [Musicpd-dev-team] MPD builds for Windows
On Tue, Oct 2, 2012 at 11:23 AM, Denis Krjuchkov de...@crazydev.net wrote: Hi all, according to that http://sourceforge.net/mailarchive/message.php?msg_id=29496606 there are some issues with building MPD 0.17 for Windows. Is there any estimate on getting binaries again? If no I would like to contribute by providing windows builds on a regular basis. Please do, I just got done trying to make a quality binary build and it fails to work for some reason I haven't been able to find out (newer mingw builds need to link with libgcc??). It's really time consuming, and something I really don't have time or a real passion for anymore. -- avuton -- Fortes fortuna adiuvat -- Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] No Windows binary for 0.17 release?
On Wed, Jul 4, 2012 at 8:03 AM, zw g pekingmas...@gmail.com wrote: Hi, Why the latest 0.17 release has no Windows binary? Lack of manpower? Last time I tried, flac failed to compile. I simply haven't had time to make it work (yet). flac-dev ml said they couldn't reproduce the problem and that leaves me with having to take the time to setup a newer mingw dev env. May take another week or so. Also: git://git.musicpd.org/avuton/mpd-release-utils.git is what I'll use to build it when I get an opportunity. -- avuton -- Fortes fortuna adiuvat -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] mpdscribble for win32?
On Mon, Feb 6, 2012 at 11:18 AM, Bart Nagel b...@tremby.net wrote: Hi, folks. I've just started at a new job and have been given a Windows box. I've managed to get MPD and a couple of clients running (which is going to make my life much more comfortable) but I can't find a win32 binary for mpdscribble. I'm not up to compiling it myself (in a Windows environment, anyway), so does anyone know of an existing binary, or is anyone willing to do me a favour and produce one? I can offer a small bounty if that swings it. I will tonight. No bounty, it works oob with my scripts. -- avuton -- Fortes fortuna adiuvat -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] mpdscribble for win32?
On Mon, Feb 6, 2012 at 1:13 PM, Bart Nagel b...@tremby.net wrote: At 2012-02-06 13:11:36 -0800, Avuton Olrich wrote: On Mon, Feb 6, 2012 at 11:18 AM, Bart Nagel b...@tremby.net wrote: Hi, folks. I've just started at a new job and have been given a Windows box. I've managed to get MPD and a couple of clients running (which is going to make my life much more comfortable) but I can't find a win32 binary for mpdscribble. I'm not up to compiling it myself (in a Windows environment, anyway), so does anyone know of an existing binary, or is anyone willing to do me a favour and produce one? I can offer a small bounty if that swings it. I will tonight. No bounty, it works oob with my scripts. Thanks very much! I didn't test it, but last time I tested it, it was fine. If you run into any issues, feel free to shoot me an email. http://sourceforge.net/projects/musicpd/files/mpdscribble/0.22/mpdscribble-0.22-win32.zip/download -- avuton -- Fortes fortuna adiuvat -- Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] MPD doesn't build on FC16
On Thu, Dec 1, 2011 at 3:49 PM, Carsten Breuer carstenbreuer...@textwork.de wrote: Hi guys, I have tried to build 16-5 on Fedora Core 16. and end up with the message: checking for _FILE_OFFSET_BITS value needed for large files... 64 checking for GLIB... no configure: error: GLib 2.12 is required I think this is a autoconf bug, because glib2 is there: Installierte Pakete Name : glib2 Architektur : i686 Version : 2.30.1 Ausgabe : 1.fc16 Größe : 8.5 M This error also occurs with the current today git version. Any hints ? It's got something to do with the newer pkg-config stuff for that package. I'd say they probably made gthread-3.0 rather than 2.0? You could start by: pkg-config --list-all | grep -E 'glib-2.0|gthread-2.0' Which one doesn't print? Change that in the configure.ac string. autogen then compile as usual. Please let me know where the problem lies. -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Some more unused files report
On Wed, Oct 19, 2011 at 1:02 PM, Denis Krjuchkov de...@crazydev.net wrote: I've made little more investigations on what libraries are actually used. Here is updated list of unused libraries. libbz2.dll libgio-2.0-0.dll libgmodule-2.0-0.dll libgobject-2.0-0.dll libltdl-7.dll libpcrecpp-0.dll libpulse-mainloop-glib-0.dll libpulse-simple-0.dll libpulsecore-1.0.dll libzzipmmapped-0-13.dll postproc-51.dll Windows eagerly loads dependencies so I simply run MPD and tried to delete everything that is deletable. Awesome. Thanks for all the removals. I've done this before, but it's been /some/ time. At any rate, there's a new binary on sf made with the win32 regression fix and these patches. -- snip -- P.S. It would be useful to have a personal release utils repo for simple patch delivery. Looks like someone already did that: http://git.musicpd.org/cgit/dk/mpd-release-utils.git/ Just let me know when stuff is ready. Thanks, -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- The demand for IT networking professionals continues to grow, and the demand for specialized networking skills is growing even more rapidly. Take a complimentary Learning@Ciosco Self-Assessment and learn about Cisco certifications, training, and career opportunities. http://p.sf.net/sfu/cisco-dev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [patch] Exclude libzzipmmapped*.dll from Windows distribution
On Tue, Oct 18, 2011 at 12:27 AM, Denis Krjuchkov de...@crazydev.net wrote: Hi all, That file is unused and can be safely excluded. Appreciated and will be committed later today. -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2d-oct ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Has mpd release utils repository gone?
On Thu, Apr 14, 2011 at 12:42 AM, Denis Krjuchkov alcoh...@gmail.com wrote: Hello all. I've just noticed that mpd release utils repository is no longer listed in http://git.musicpd.org/ Is this is intentional? Should I expect it to be visible again? Unintentional. Not sure why it's happening, I continue to push to it but for some reason it /has/ disappeared. Stay tuned. -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- Benefiting from Server Virtualization: Beyond Initial Workload Consolidation -- Increasing the use of server virtualization is a top priority.Virtualization can reduce costs, simplify management, and improve application availability and disaster protection. Learn more about boosting the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] MPD fails to compile for win32 with roaraudio support
Hello, Compiling for a win32 target with roaraudio-0.4beta3 I get the following: i586-mingw32msvc-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I./src -mms-bitfields -I/home/avuton/src/mpd-release-utils/build-dir/include/glib-2.0 -I/home/avuton/src/mpd-release-utils/build-dir/lib/glib-2.0/include -DSYSTEM_CONFIG_FILE_LOCATION='/home/avuton/src/mpd-release-utils/build-dir/etc/mpd.conf' -I/home/avuton/src/mpd-release-utils/build-dir/include -I/home/avuton/src/mpd-release-utils/build-dir/include -Wall -Wextra -Wmissing-prototypes -Wshadow -Wpointer-arith -Wstrict-prototypes -Wcast-qual -Wwrite-strings -pedantic -O0 -ggdb3 -gstabs -pipe -MT src/output/src_mpd-roar_plugin.o -MD -MP -MF src/output/.deps/src_mpd-roar_plugin.Tpo -c -o src/output/src_mpd-roar_plugin.o `test -f 'src/output/roar_plugin.c' || echo './'`src/output/roar_plugin.c In file included from src/output/roar_output_plugin.h:25, from src/output/roar_plugin.c:24: /home/avuton/src/mpd-release-utils/build-dir/include/roaraudio.h:288:31: warning: ISO C does not permit named variadic macros /home/avuton/src/mpd-release-utils/build-dir/include/roaraudio.h:291:30: warning: ISO C does not permit named variadic macros /home/avuton/src/mpd-release-utils/build-dir/include/roaraudio.h:292:31: warning: ISO C does not permit named variadic macros /home/avuton/src/mpd-release-utils/build-dir/include/roaraudio.h:300:39: warning: ISO C does not permit named variadic macros src/output/roar_plugin.c:28:24: error: sys/socket.h: No such file or directory src/output/roar_plugin.c:29:23: error: arpa/inet.h: No such file or directory src/output/roar_plugin.c:30:19: error: netdb.h: No such file or directory So, ifdef'ing that like httpd_output_plugin is done with libwrap then shows this: src/mixer/roar_mixer_plugin.c:31:23: error: sys/ioctl.h: No such file or directory Any love? Thanks, avuton -- Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Windows port status
On Fri, Sep 17, 2010 at 9:54 AM, Tony Miller mcfiredr...@gmail.com wrote: I havn't been able to get the library to finish updating. It only gets through about 20 of my 1000 or so songs. Playback is fine. I'm on cygwin. Have you ever had this problem? I'll turn on verbose logging and check for anything. I have not tested with my entire collection (yet); verbose logging and debugging (gdb if logs don't produce good trackdown) would be excellent. Please post a bug and that will be a high priority for me, if I can take care of it. Thanks! -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [PATCH] GameMusicEmu decoder
On Sat, Apr 10, 2010 at 1:23 AM, Tony Miller mcfiredr...@gmail.com wrote: On Tue, Apr 06, 2010 at 06:48:38AM -0700, Avuton Olrich wrote: - [gme deocder plugin], [libgme not found]) + [gme decoder plugin], [libgme not found]) Thanks Avuton. I tested the error handling, I renamed a blank file to have a .spc extension, and the decoder safely ignored it, since it wasn't actually an spc file. The patch with the original and the fixes is the top patch in my repo. I tried to do git rebase to combine a new patch with the old one, but it didn't quite work out, so I ended up deleting my repo and starting over... Next time I'll use stgit. -Tony Any word on this one? This looks like a nice plugin and I definitely can't wait for the spc stuff to be in MPD. Thanks! -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [PATCH] GameMusicEmu decoder
On Sun, Apr 4, 2010 at 1:03 AM, Tony Miller mcfiredr...@gmail.com wrote: I've written a patch for a decoder that uses the Game Music Emulation library. This library suports many video game music formats. The patch is available in the latest commit in my repository: g...@github.com:mcfiredrill/mpd.git More information on this library is available here: http://www.fly.net/~ant/libs/audio.html Don't download it from there though, get the latest svn from here: http://code.google.com/p/game-music-emu/source/checkout If you need some sample music to try it out, get some super nintendo .spc files from here: http://snesmusic.org/ Hopefully I can help get this library into some distros soon. Thanks! -Tony Small detail: diff --git a/src/decoder/gme_decoder_plugin.c b/src/decoder/gme_decoder_plugin.c index 88afcd8..f75cb64 100644 --- a/src/decoder/gme_decoder_plugin.c +++ b/src/decoder/gme_decoder_plugin.c @@ -32,7 +32,7 @@ gme_file_decode(struct decoder *decoder, const char *path_fs) song_len = ti-length / 1000.0; else song_len = -1; - /* initilize the MPD decoder */ + /* initialize the MPD decoder */ audio_format.sample_rate = sample_rate; audio_format.format = SAMPLE_FORMAT_S16; audio_format.channels = 2; -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [GIT PULL] Add win32 support
Hello, I've finally compiled a MPD binary for win32, issues still remain but it does run. Takes a couple of patches against the master. Please pull. git://git.musicpd.org/avuton/mpd.git -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Repositories
On Sun, Feb 14, 2010 at 9:01 AM, Sven Ginka sven.gi...@gmail.com wrote: hi folks, there are a couple of source code mangement servers online. which one is the one with the official/latest source? http://git.musicpd.org/ http://musicpd.git.sourceforge.net/ https://svn.musicpd.org/ best -tswaehn Only one has had any updates in the last year. git.musicpd.org The sf one has been removed (thought I disabled it long ago). -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Repositories
On Sun, Feb 14, 2010 at 9:27 AM, Sven Ginka sven.gi...@gmail.com wrote: hi avuton, there is still code in the sf repo. I suggest to remove the contents to avoid confusions. so how about the svn? as far as I could make out the svn is not the same as the git. however to avoid confusions I would close it or move it to git ?? sf/git's been disabled. Didn't talk about svn because I don't know about it. best -tswaehn ps: I guess you dont like iphones? do you? how come? Had someone tape a conversation I had.. long story. -- avuton -- If someone nearby has an iphone and leaves it near you, be aware they may be spying on you. -- SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] server to server connection
On Sun, Oct 25, 2009 at 11:41 PM, Metyl Methylius the.me...@gmail.com wrote: Sorry, but this is closing eyes with such an answer, I dont have upload for that, my DSL connection has 256kbit uplink. Pulseaudio throughtput will be at leas 1387 Kbits. Thats 5 times more than I could afford. Then you're looking for the httpd/icecast output. -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] server to server connection
On Sun, Oct 25, 2009 at 8:41 AM, Stefan Monnier monn...@iro.umontreal.ca wrote: That's the point though. Why introduce this complexity when it's unnecessary? Let's state a much simpler way without complicating how things currently work. I agree that the underlying functionality is already provided in enough ways. But maybe MPD could provide a bit of help here and there to make it easier to setup such a thing with a minimum of extra configuration. Autodiscovery and use of upnp/dlna/daap would be about as easy as it gets, and for media access and streaming; it's not a rejection of the technology, if it was done well, I'm sure it would be accepted. Can't expect devs to scratch your itches if it's not their own (though sometimes they do anyhow). E.g. if you want to access the filesystem currently you end up having to read MPD's config file (which may be pretty tricky to find: list processes running, guess which one is the mpd you care about, extract the config file name from the command line). Here MPD could help by providing this config info via a command. That would also help clients which want to access the song-database to find album covers. Because that's a hack at best; I'm not saying covers should or should not be part of the protocol, but hacks really shouldn't be part of the protocol and coverart support appears to be great enough without local filesystem access with the various coverart downloaders and cachers. A non hack would be the client asking the user where the music root is (if they even have access to it) so the client doesn't assume that the user wants the client to access his filesystem. -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] server to server connection
On Sun, Oct 25, 2009 at 9:58 AM, Steffen 'stefreak' Neubauer stefr...@stefreak.de wrote: On Sat, 24 Oct 2009 06:12:17 -0700 Avuton Olrich avu...@gmail.com wrote: Point is MPD can /easily/ do what you're looking for without reworking a wheel. No that's not true. You can _not_ do it easily, that's my point. All ways you posted are complex and static. And all those things are not what i wanted. I don't want to only share the music on the network - there are ways to do that and i know it (like NFS). But how complicated is it to set up and maintain an NFS server compared to setting up and maintaining MPD? And how static is that setup? It isn't easy. It is easier for the developer, of course, but not for the user. This thread is bordering on trolling but I'm going to briefly take the bait and never read it again. There is nothing complex about setting up NFS, it takes less than 3 minutes of googling and setup on any easy-to-use distribution; maybe 10 minutes if the user has never used a computer before as long as the user knows how google works and can follow instructions. Secondly, option #4 is what you're talking about, but if the user isn't experienced enough, nor willing to take the time to put into setting up NFS, then they wouldn't setup for MPD, much less dlna/upnp/daap. And this is before all the crazy security risks and precautions that would then have to be built into MPD to take advantage of your cunning plan. -- avuton -- Math is hard, let's go shopping! -- Barbie -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] server to server connection
On Sun, Oct 25, 2009 at 11:20 AM, Metyl Methylius the.me...@gmail.com wrote: Hi *, I have the same problem about mpd. I need a transparent access to my setuped instance of mpd anywhere on the network (i like to listen music from my collection from work. No decoding and encoding only transparent data transfer. Only then the quality of the record stays same as was in the other mpd instance on the network. This would require implementing new TCP or UDP port or a upgrade in protocol interface. Or another example of use - You connect to your home wifi and wanna play newly captured files from your notebook to your homeaudio (wireless router with mpd and USB card). pulseaudio -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [RFC] libmpdclient win32 software installer
Hello, As many know libmpdclient2 is due any minute now for release, and the win32 binary will probably follow behind soon thereafter. I would like to create an installer so there's no question on how it's all done. I'm not familiar with how this should work and it makes me want to cry when I attempt to find out. Hoping that posting here and being lazy will help. Following is a conversion from the gmpc nsi file in which convert all instances of gmpc to libmpdclient and removed the start menu entries. The installation directory needs to be changed and possibly more. If I can't get help with this it won't be worth releasing a win32 binary. Please help! Thanks! -- ; libmpdclient.nsi ; ; libmpdclient installation script for NSIS installer compiler ; By: Daniel Lindenaar daniel-libmpdcli...@lindenaar.org ; Modified by: Qball Cow qb...@sarine.nl ; SetCompressor /SOLID lzma ; ;Include Modern UI !include MUI.nsh ; The name of the installer Name libmpdclient ; The file to write OutFile libmpdclient_win32_installer.exe ; The default installation directory InstallDir $PROGRAMFILES\libmpdclient InstallDirRegKey HKLM Software\libmpdclient InstallationDirectory ; ;Variables Var StartMenuFolder ; ;Interface Settings !define MUI_ABORTWARNING ; Pages ; Install !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE ../COPYING !insertmacro MUI_PAGE_DIRECTORY ;Start Menu Folder Page Configuration !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKCU !define MUI_STARTMENUPAGE_REGISTRY_KEY Software\libmpdclient !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME libmpdclient !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_RUN $INSTDIR\libmpdclient.exe !insertmacro MUI_PAGE_FINISH ; Uninstall !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES ; ;Languages !insertmacro MUI_LANGUAGE English ; ; The stuff to install Section Install ; Add entries to windows Add/Remove software WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\libmpdclient DisplayName libmpdclient WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\libmpdclient UninstallString '$INSTDIR\uninstall.exe' WriteRegDWORD HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\libmpdclient NoModify 1 WriteRegDWORD HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\libmpdclient NoRepair 1 ; Set output path to the installation directory. SetOutPath $INSTDIR ; Put file there File /r ../libmpdclient-latest/*.* ; no idea WriteRegStr HKLM Software\libmpdclient InstallationDirectory $INSTDIR ; Install uninstaller WriteUninstaller $INSTDIR\Uninstall.exe SectionEnd ; end the section Section Uninstall ; Remove all the files in install dir RMDir /r $INSTDIR ; Remove registry keys DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\libmpdclient DeleteRegKey HKLM Software\libmpdclient SectionEnd -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [RFC] libmpdclient win32 software installer
Max Kellermann wrote: On 2009/10/03 21:17, Avuton Olrich avu...@gmail.com wrote: As many know libmpdclient2 is due any minute now for release, and the win32 binary will probably follow behind soon thereafter. I would like to create an installer so there's no question on how it's all done. I'm not familiar with how this should work and it makes me want to cry when I attempt to find out. Hoping that posting here and being lazy will help. It's perfectly ok to release a .zip file with bin/ include/ lib/ directories, like many other projects do. You could write a Makefile.am target which creates this zip file. Client developers could then ship libmpdclient2.dll with their client. Sure, the long-term goal is to have one global libmpdclient2.dll, with a fancy installer, which is shared by all clients, but that's not too important today, for the first release. Max On Sat, Oct 3, 2009 at 12:37 PM, Christ Schlacta aarc...@gmail.com wrote: nullsoft has a popular open source installer generator. could look into that. (fixed top post) Yes, that's what I was posting; I posted an example NSI, the main problem is I'm unsure where global libraries go. I'd like to make sure I'm not mucking stuff up too much. I'd also like to know if a restart is required after install of global libraries. When it comes down to it, developers could distribute individually, or we could do this right in the first go-around and just have global from the get-go. -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Come build with us! The BlackBerryreg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9#45;12, 2009. Register now#33; http://p.sf.net/sfu/devconf ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] MPD-0.15.1 released
Hi, 0.15.1 released and includes fixed Mac OS X compilation, an assertion fix in the FLAC decoder, the split second resume playback during pause, and a double free() on shutdown. Thanks to all contributors! Download It: http://sourceforge.net/projects/musicpd/files/mpd/mpd-0.15.1.tar.bz2 Read more about it: http://sourceforge.net/project/shownotes.php?group_id=81117release_id=697308 Bug it: http://musicpd.org/mantis -- avuton -- All opinions stated above are mine and do not necessarily reflect those of the US secret service. -- Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 1/4] decoder: Rename all main decoder plugins functions to *decoder_plugin.
---
src/decoder/audiofile_plugin.c |2 +-
src/decoder/ffmpeg_plugin.c|2 +-
src/decoder/modplug_plugin.c |2 +-
src/decoder/wavpack_plugin.c |2 +-
src/decoder_list.c | 16
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c
index 35d6ac3..f66d90d 100644
--- a/src/decoder/audiofile_plugin.c
+++ b/src/decoder/audiofile_plugin.c
@@ -212,7 +212,7 @@ static const char *const audiofile_mime_types[] = {
NULL
};
-const struct decoder_plugin audiofilePlugin = {
+const struct decoder_plugin audiofile_decoder_plugin = {
.name = audiofile,
.stream_decode = audiofile_stream_decode,
.tag_dup = audiofile_tag_dup,
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index e262afe..285b07e 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -529,7 +529,7 @@ static const char *const ffmpeg_mime_types[] = {
NULL
};
-const struct decoder_plugin ffmpeg_plugin = {
+const struct decoder_plugin ffmpeg_decoder_plugin = {
.name = ffmpeg,
.init = ffmpeg_init,
.stream_decode = ffmpeg_decode,
diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_plugin.c
index 77b8465..f636f2f 100644
--- a/src/decoder/modplug_plugin.c
+++ b/src/decoder/modplug_plugin.c
@@ -207,7 +207,7 @@ static const char *const mod_suffixes[] = {
NULL
};
-const struct decoder_plugin modplug_plugin = {
+const struct decoder_plugin modplug_decoder_plugin = {
.name = modplug,
.stream_decode = mod_decode,
.tag_dup = mod_tagdup,
diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c
index e0951a7..821536f 100644
--- a/src/decoder/wavpack_plugin.c
+++ b/src/decoder/wavpack_plugin.c
@@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = {
NULL
};
-const struct decoder_plugin wavpack_plugin = {
+const struct decoder_plugin wavpack_decoder_plugin = {
.name = wavpack,
.stream_decode = wavpack_streamdecode,
.file_decode = wavpack_filedecode,
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 6e5c8cf..8d6e6c2 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -31,17 +31,17 @@ extern const struct decoder_plugin mad_decoder_plugin;
extern const struct decoder_plugin vorbis_decoder_plugin;
extern const struct decoder_plugin flac_decoder_plugin;
extern const struct decoder_plugin oggflac_decoder_plugin;
-extern const struct decoder_plugin audiofilePlugin;
+extern const struct decoder_plugin audiofile_decoder_plugin;
extern const struct decoder_plugin mp4ff_decoder_plugin;
extern const struct decoder_plugin faad_decoder_plugin;
extern const struct decoder_plugin mpcdec_decoder_plugin;
-extern const struct decoder_plugin wavpack_plugin;
-extern const struct decoder_plugin modplug_plugin;
+extern const struct decoder_plugin wavpack_decoder_plugin;
+extern const struct decoder_plugin modplug_decoder_plugin;
extern const struct decoder_plugin mikmod_decoder_plugin;
extern const struct decoder_plugin sidplay_decoder_plugin;
extern const struct decoder_plugin fluidsynth_decoder_plugin;
extern const struct decoder_plugin wildmidi_decoder_plugin;
-extern const struct decoder_plugin ffmpeg_plugin;
+extern const struct decoder_plugin ffmpeg_decoder_plugin;
static const struct decoder_plugin *const decoder_plugins[] = {
#ifdef HAVE_MAD
@@ -57,7 +57,7 @@ static const struct decoder_plugin *const decoder_plugins[] =
{
flac_decoder_plugin,
#endif
#ifdef HAVE_AUDIOFILE
- audiofilePlugin,
+ audiofile_decoder_plugin,
#endif
#ifdef HAVE_FAAD
faad_decoder_plugin,
@@ -69,10 +69,10 @@ static const struct decoder_plugin *const decoder_plugins[]
= {
mpcdec_decoder_plugin,
#endif
#ifdef HAVE_WAVPACK
- wavpack_plugin,
+ wavpack_decoder_plugin,
#endif
#ifdef HAVE_MODPLUG
- modplug_plugin,
+ modplug_decoder_plugin,
#endif
#ifdef ENABLE_MIKMOD_DECODER
mikmod_decoder_plugin,
@@ -87,7 +87,7 @@ static const struct decoder_plugin *const decoder_plugins[] =
{
wildmidi_decoder_plugin,
#endif
#ifdef HAVE_FFMPEG
- ffmpeg_plugin,
+ ffmpeg_decoder_plugin,
#endif
};
--
1.6.2.2
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 0/4] Trivial fixes
Hi Max, The git trees are obviously down right now, take em now or I'll push 'em when the server comes back up. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 3/4] configure: add shout AC_DEFINE, otherwise it will not enable.
--- configure.ac |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 6389c33..5848942 100644 --- a/configure.ac +++ b/configure.ac @@ -1004,6 +1004,9 @@ if test x$enable_httpd_output = xauto; then fi AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) +if test x$enable_shout = xyes; then + AC_DEFINE(HAVE_SHOUT, 1, [Define to enable the shoutcast output]) +fi AM_CONDITIONAL(ENABLE_HTTPD_OUTPUT, test x$enable_httpd_output = xyes) if test x$enable_httpd_output = xyes; then -- 1.6.2.2 -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] MPD should obsolete manual db updates.
On Fri, Apr 3, 2009 at 8:32 AM, Baybal Ni nikuli...@gmail.com wrote: MPD should use inotify in linux and it's analogues in another operating systems to update it's db automaticaly. This mailing list is not a bugtracker, but rest assured, we're way ahead of you. Feel free to monitor this bug. http://musicpd.org/mantis/view.php?id=2091 -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [Musicpd-release-team] MPD-0.15~alpha1
On Thu, Apr 2, 2009 at 9:27 AM, Qball Cow qb...@qballcow.nl wrote: When did osX playback break? as I have been using it on osX a few weeks ago, I even build a ready to use tar.gz for mpd. What does not work is the demonizing on osX. Don't know more than the bug: http://musicpd.org/mantis/view.php?id=2071 -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 02/23] exconf: Comment formerly required files.
--- doc/mpdconf.example |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 646b56d..d875f9c 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -6,20 +6,20 @@ # This setting controls the top directory which MPD will search to discover the # available audio files and add them to the daemon's online database. # -music_directory~/music +#music_directory ~/music # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use # playlist files not created by the server but only if they are in the MPD # format. # -playlist_directory ~/.mpd/playlists +#playlist_directory~/.mpd/playlists # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the # server is not up. # -db_file~/.mpd/database +#db_file ~/.mpd/database # # These settings are the locations for the daemon log files for the daemon. # These logs are great for troubleshooting, depending on your log_level @@ -29,7 +29,7 @@ db_file ~/.mpd/database # On most systems, log messages will appear in /var/log/daemon.log # then. # -log_file ~/.mpd/log +#log_file ~/.mpd/log # # This setting sets the location of the file which stores the process ID # for use of mpd --kill and some init scripts. This setting is disabled by -- 1.6.1.3 -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 07/23] command: command_error() is not necessary for export.
---
src/command.c |2 +-
src/command.h |3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/command.c b/src/command.c
index 69fbe51..ad14f52 100644
--- a/src/command.c
+++ b/src/command.c
@@ -121,7 +121,7 @@ static void command_error_v(struct client *client, enum ack
error,
current_command = NULL;
}
-G_GNUC_PRINTF(3, 4) void command_error(struct client *client, enum ack error,
+G_GNUC_PRINTF(3, 4) static void command_error(struct client *client, enum ack
error,
const char *fmt, ...)
{
va_list args;
diff --git a/src/command.h b/src/command.h
index 7e03e36..a7c408e 100644
--- a/src/command.h
+++ b/src/command.h
@@ -47,7 +47,4 @@ command_process(struct client *client, char *commandString);
void command_success(struct client *client);
-G_GNUC_PRINTF(3, 4) void command_error(struct client *client, enum ack error,
- const char *fmt, ...);
-
#endif
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 06/23] client: client_write() does not necessary for export.
---
src/client.c |5 -
src/client.h |5 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/client.c b/src/client.c
index 65dc858..369390b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -773,7 +773,10 @@ static void client_write_output(struct client *client)
client-send_buf_used = 0;
}
-void client_write(struct client *client, const char *buffer, size_t buflen)
+/**
+ * Write a block of data to the client.
+ */
+static void client_write(struct client *client, const char *buffer, size_t
buflen)
{
/* if the client is going to be closed, do nothing */
if (client_is_expired(client))
diff --git a/src/client.h b/src/client.h
index c992dab..824497a 100644
--- a/src/client.h
+++ b/src/client.h
@@ -46,11 +46,6 @@ unsigned client_get_permission(const struct client *client);
void client_set_permission(struct client *client, unsigned permission);
/**
- * Write a block of data to the client.
- */
-void client_write(struct client *client, const char *data, size_t length);
-
-/**
* Write a C string to the client.
*/
void client_puts(struct client *client, const char *s);
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 04/23] exconf: update mixer documentation.
--- doc/mpdconf.example | 19 --- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 2f6259b..5061489 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -258,20 +258,25 @@ # Volume control mixer # -# MPD has limited volume controls, to use them pick one below. If one is not -# specified it may be autodetected at startup, depending on the dependencies -# which were compiled into the server. +# These are the global volume control settings. By default, this setting will +# be detected to the available audio output device, with preference going to +# hardware mixing. Hardware and software mixers for individual audio_output +# sections cannot yet be mixed. # -# An example for controlling an ALSA or OSS mixer: +# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this +# setting is used other sound applications will be affected by the volume +# being controlled by MPD. # #mixer_typehardware # -# This example is a general volume control mixer, it is used to adjust the -# volume of the audio sent to the audio output, and will work with all outputs. +# An example for controlling all mixers through software. This will control +# all controls, even if the mixer is not supported by the device and will not +# affect any other sound producing applications. # #mixer_typesoftware # -# This example will not allow MPD to touch the mixer at all. +# This example will not allow MPD to touch the mixer at all and will disable +# all volume controls. # #mixer_typedisabled # -- 1.6.1.3 -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 10/23] fifo: remove unused function fifo_buffer_clear().
---
src/fifo_buffer.c |9 -
src/fifo_buffer.h |8
2 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/src/fifo_buffer.c b/src/fifo_buffer.c
index adee438..b6b5cc0 100644
--- a/src/fifo_buffer.c
+++ b/src/fifo_buffer.c
@@ -65,15 +65,6 @@ fifo_buffer_free(struct fifo_buffer *buffer)
g_free(buffer);
}
-void
-fifo_buffer_clear(struct fifo_buffer *buffer)
-{
- assert(buffer != NULL);
-
- buffer-start = 0;
- buffer-end = 0;
-}
-
const void *
fifo_buffer_read(const struct fifo_buffer *buffer, size_t *length_r)
{
diff --git a/src/fifo_buffer.h b/src/fifo_buffer.h
index 4af6bde..d2a4287 100644
--- a/src/fifo_buffer.h
+++ b/src/fifo_buffer.h
@@ -63,14 +63,6 @@ void
fifo_buffer_free(struct fifo_buffer *buffer);
/**
- * Clears all data currently in this #fifo_buffer object. This does
- * not overwrite the actuall buffer; it just resets the internal
- * pointers.
- */
-void
-fifo_buffer_clear(struct fifo_buffer *buffer);
-
-/**
* Reads from the beginning of the buffer. To remove consumed data
* from the buffer, call fifo_buffer_consume().
*
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 01/23] exconf: Merge required files with optional.
--- doc/mpdconf.example |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index bacc2ec..646b56d 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -1,7 +1,7 @@ # An example configuration file for MPD # See the mpd.conf man page for a more detailed description of each parameter. -# Required files and directories ## +# Files and directories ### # # This setting controls the top directory which MPD will search to discover the # available audio files and add them to the daemon's online database. @@ -30,10 +30,6 @@ db_file ~/.mpd/database # then. # log_file ~/.mpd/log -### - - -# Optional files ## # # This setting sets the location of the file which stores the process ID # for use of mpd --kill and some init scripts. This setting is disabled by -- 1.6.1.3 -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 13/23] locate: remove unused function locate_item_free().
---
src/locate.c |7 ---
src/locate.h |3 ---
2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/locate.c b/src/locate.c
index 7e99a24..6c4134d 100644
--- a/src/locate.c
+++ b/src/locate.c
@@ -119,13 +119,6 @@ locate_item_list_casefold(const struct locate_item_list
*list)
return new_list;
}
-void
-locate_item_free(struct locate_item *item)
-{
- g_free(item-needle);
- g_free(item);
-}
-
static bool
locate_tag_search(const struct song *song, enum tag_type type, const char *str)
{
diff --git a/src/locate.h b/src/locate.h
index f9276b3..19f6879 100644
--- a/src/locate.h
+++ b/src/locate.h
@@ -70,9 +70,6 @@ locate_item_list_casefold(const struct locate_item_list
*list);
void
locate_item_list_free(struct locate_item_list *list);
-void
-locate_item_free(struct locate_item *item);
-
bool
locate_song_search(const struct song *song,
const struct locate_item_list *criteria);
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 09/23] decoder_buffer: remove unused function decoder_buffer_is_empty().
---
src/decoder_buffer.c |6 --
src/decoder_buffer.h |3 ---
2 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/decoder_buffer.c b/src/decoder_buffer.c
index 76e9126..dc28e9d 100644
--- a/src/decoder_buffer.c
+++ b/src/decoder_buffer.c
@@ -70,12 +70,6 @@ decoder_buffer_free(struct decoder_buffer *buffer)
}
bool
-decoder_buffer_is_empty(const struct decoder_buffer *buffer)
-{
- return buffer-consumed == buffer-length;
-}
-
-bool
decoder_buffer_is_full(const struct decoder_buffer *buffer)
{
return buffer-consumed == 0 buffer-length == buffer-size;
diff --git a/src/decoder_buffer.h b/src/decoder_buffer.h
index d951a40..4700fb4 100644
--- a/src/decoder_buffer.h
+++ b/src/decoder_buffer.h
@@ -52,9 +52,6 @@ void
decoder_buffer_free(struct decoder_buffer *buffer);
bool
-decoder_buffer_is_empty(const struct decoder_buffer *buffer);
-
-bool
decoder_buffer_is_full(const struct decoder_buffer *buffer);
/**
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 11/23] icy_metadata: icy_reset() is not necessary for export.
---
src/icy_metadata.c |2 +-
src/icy_metadata.h |3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/icy_metadata.c b/src/icy_metadata.c
index 69aa890..cd274ca 100644
--- a/src/icy_metadata.c
+++ b/src/icy_metadata.c
@@ -28,7 +28,7 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN icy_metadata
-void
+static void
icy_deinit(struct icy_metadata *im)
{
if (!icy_defined(im))
diff --git a/src/icy_metadata.h b/src/icy_metadata.h
index f8eac4e..bdb209e 100644
--- a/src/icy_metadata.h
+++ b/src/icy_metadata.h
@@ -59,9 +59,6 @@ icy_start(struct icy_metadata *im, size_t data_size)
void
icy_reset(struct icy_metadata *im);
-void
-icy_deinit(struct icy_metadata *im);
-
/**
* Checks whether the icy_metadata object is enabled.
*/
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 16/23] queue: queue_generate_id() is not necessary for export.
---
src/queue.c |5 -
src/queue.h |6 --
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/queue.c b/src/queue.c
index 21d4884..d7e3b96 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -20,7 +20,10 @@
#include queue.h
#include song.h
-unsigned
+/**
+ * Generate a non-existing id number.
+ */
+static unsigned
queue_generate_id(const struct queue *queue)
{
static unsigned cur = (unsigned)-1;
diff --git a/src/queue.h b/src/queue.h
index 452084c..e61c273 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -227,12 +227,6 @@ void
queue_finish(struct queue *queue);
/**
- * Generate a non-existing id number.
- */
-unsigned
-queue_generate_id(const struct queue *queue);
-
-/**
* Returns the order number following the specified one. This takes
* end of queue and repeat mode into account.
*
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 15/23] player_control: remove unused function playerCurrentDecodeSong().
---
src/player_control.c |7 ---
src/player_control.h |3 ---
2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/player_control.c b/src/player_control.c
index dbeacf2..df4f4bf 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -268,10 +268,3 @@ double getPlayerTotalPlayTime(void)
{
return pc.total_play_time;
}
-
-/* this actually creates a dupe of the current metadata */
-struct song *
-playerCurrentDecodeSong(void)
-{
- return NULL;
-}
diff --git a/src/player_control.h b/src/player_control.h
index 4b463c6..c8bcf24 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -149,9 +149,6 @@ player_get_audio_format(void)
return pc.audio_format;
}
-struct song *
-playerCurrentDecodeSong(void);
-
void playerInit(void);
#endif
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 18/23] queue_print: queue_print_song_info() is not necessry for export.
---
src/queue_print.c | 10 +-
src/queue_print.h | 12
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/queue_print.c b/src/queue_print.c
index ef94100..2ca9ccc 100644
--- a/src/queue_print.c
+++ b/src/queue_print.c
@@ -24,7 +24,15 @@
#include locate.h
#include client.h
-void
+/**
+ * Send detailed information about a range of songs in the queue to a
+ * client.
+ *
+ * @param client the client which has requested information
+ * @param start the index of the first song (including)
+ * @param end the index of the last song (excluding)
+ */
+static void
queue_print_song_info(struct client *client, const struct queue *queue,
unsigned position)
{
diff --git a/src/queue_print.h b/src/queue_print.h
index c43c680..02cbc8b 100644
--- a/src/queue_print.h
+++ b/src/queue_print.h
@@ -32,18 +32,6 @@ struct queue;
struct locate_item_list;
void
-queue_print_song_info(struct client *client, const struct queue *queue,
- unsigned position);
-
-/**
- * Send detailed information about a range of songs in the queue to a
- * client.
- *
- * @param client the client which has requested information
- * @param start the index of the first song (including)
- * @param end the index of the last song (excluding)
- */
-void
queue_print_info(struct client *client, const struct queue *queue,
unsigned start, unsigned end);
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 22/23] client: group static function declarations together.
---
src/client.c | 11 +--
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/client.c b/src/client.c
index 369390b..bb20441 100644
--- a/src/client.c
+++ b/src/client.c
@@ -113,6 +113,11 @@ static void client_write_deferred(struct client *client);
static void client_write_output(struct client *client);
+static void client_manager_expire(void);
+
+static gboolean
+client_in_event(GIOChannel *source, GIOCondition condition, gpointer data);
+
bool client_is_expired(const struct client *client)
{
return client-channel == NULL;
@@ -133,9 +138,6 @@ void client_set_permission(struct client *client, unsigned
permission)
client-permission = permission;
}
-static void
-client_manager_expire(void);
-
/**
* An idle event which calls client_manager_expire().
*/
@@ -165,9 +167,6 @@ static inline void client_set_expired(struct client *client)
}
}
-static gboolean
-client_in_event(GIOChannel *source, GIOCondition condition, gpointer data);
-
static void client_init(struct client *client, int fd)
{
static unsigned int next_client_num;
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 23/23] exconf: Fix spacing
--- doc/mpdconf.example |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 5061489..e231296 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -1,6 +1,7 @@ # An example configuration file for MPD # See the mpd.conf man page for a more detailed description of each parameter. + # Files and directories ### # # This setting controls the top directory which MPD will search to discover the @@ -103,6 +104,7 @@ # ### + # Symbolic link behavior ## # # If this setting is set to yes, MPD will discover audio files by following @@ -117,6 +119,7 @@ # ### + # Zeroconf / Avahi Service Discovery ## # # If this setting is set to yes, service information will be published with -- 1.6.1.3 -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 21/23] tag: remove unused function void tag_delete_item().
---
src/tag.c | 22 --
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/src/tag.c b/src/tag.c
index 2cdefd5..c09fda7 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -126,28 +126,6 @@ struct tag *tag_new(void)
return ret;
}
-static void tag_delete_item(struct tag *tag, unsigned idx)
-{
- assert(idx tag-num_items);
- tag-num_items--;
-
- g_mutex_lock(tag_pool_lock);
- tag_pool_put_item(tag-items[idx]);
- g_mutex_unlock(tag_pool_lock);
-
- if (tag-num_items - idx 0) {
- memmove(tag-items + idx, tag-items + idx + 1,
- tag-num_items - idx);
- }
-
- if (tag-num_items 0) {
- tag-items = g_realloc(tag-items, items_size(tag));
- } else {
- g_free(tag-items);
- tag-items = NULL;
- }
-}
-
void tag_free(struct tag *tag)
{
int i;
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [PATCH 12/23] locate: remove unused function locate_item_new().
---
src/locate.c | 13 -
src/locate.h |4
2 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/src/locate.c b/src/locate.c
index f0b0a26..7e99a24 100644
--- a/src/locate.c
+++ b/src/locate.c
@@ -63,19 +63,6 @@ locate_item_init(struct locate_item *item,
return true;
}
-struct locate_item *
-locate_item_new(const char *type_string, const char *needle)
-{
- struct locate_item *ret = g_new(struct locate_item, 1);
-
- if (!locate_item_init(ret, type_string, needle)) {
- g_free(ret);
- ret = NULL;
- }
-
- return ret;
-}
-
void
locate_item_list_free(struct locate_item_list *list)
{
diff --git a/src/locate.h b/src/locate.h
index d0bdfa1..f9276b3 100644
--- a/src/locate.h
+++ b/src/locate.h
@@ -49,10 +49,6 @@ struct locate_item_list {
int
locate_parse_type(const char *str);
-/* returns NULL if not a known type */
-struct locate_item *
-locate_item_new(const char *type_string, const char *needle);
-
/**
* Allocates a new struct locate_item_list, and initializes all
* members with zero bytes.
--
1.6.1.3
--
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] New HTTP streaming output plugin
On Mon, Mar 16, 2009 at 7:22 AM, Stefan Monnier monn...@iro.umontreal.ca wrote: Kind of, except it doesn't need UPnD or DLNA, just a new command download file. I had sent a sample patch that provided this command a long time ago. My implementation was purposefully naive, so that it could be used to download any file from the `music' subdirectories (and `playlist', tho this part is not needed any more now that we have listplaylistinfo), which I abused in my MPC.el client to also download files like dir/cover.jpg. Why in the hell would anyone want their music player to become a network filesystem protocol? I hope this never comes to fruition and would rail against it in every way that I possibly can. I'm glad people like amarok but kitchen sink applications are nonsense and they don't allow even decent user interfaces. MPDs protocol already is large and in many ways senseless. Something to download anything in music would be disgusting (not the word, but I couldn't think of a worse word) and I would have to hope that we have a maintainer at that point that keeps the mainline project from heading in that direction. There are so many other things out there that are fit for this purpose, sshfs, nfs, cifs which dedicate their whole existance to creating a good way to download files from remote servers. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [PATCH] pulse_mixer: clarify debug messages.
On Mon, Mar 16, 2009 at 2:53 PM, David Guibert david.guib...@gmail.com wrote:
Signed-off-by: David Guibert david.guib...@gmail.com
---
Avuton,
I hope this help to find which part clearly fails.
It should give me more information about bugs
- 2136
- 2138
- 2139
Regards
src/mixer/pulse_mixer.c | 45 ++---
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c
index a300a29..7f2651a 100644
--- a/src/mixer/pulse_mixer.c
+++ b/src/mixer/pulse_mixer.c
@@ -48,22 +48,19 @@ sink_input_cb(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i,
{
struct pulse_mixer *pm = userdata;
- if (eol) {
- g_debug(eol error sink_input_cb);
+ if (eol)
return;
- }
if (!i) {
g_debug(Sink input callback failure);
return;
}
- g_debug(sink input cb %s, index %d ,i-name,i-index);
- if(strcmp(i-name,pm-output_name)==0) {
- pm-index=i-index;
- pm-online=true;
- *pm-volume=i-volume;
- } else
- g_debug(bad name);
+ if(strcmp(i-name,pm-output_name) == 0) {
+ g_debug(Sink input cb %s, index %d,i-name,i-index);
+ pm-index = i-index;
+ pm-online = true;
+ *pm-volume = i-volume;
+ }
}
static void
@@ -72,21 +69,19 @@ sink_input_vol(G_GNUC_UNUSED pa_context *context, const
pa_sink_input_info *i,
{
struct pulse_mixer *pm = userdata;
- if (eol) {
- g_debug(eol error sink_input_vol);
+ if (eol)
return;
- }
if (!i) {
- g_debug(Sink input callback failure);
+ g_debug(Sink input volume failure);
return;
}
- g_debug(sink input vol %s, index %d , i-name, i-index);
- *pm-volume=i-volume;
+ g_debug(Sink input vol %s, index %d, i-name, i-index);
+ *pm-volume = i-volume;
}
static void
-subscribe_cb(G_GNUC_UNUSED pa_context *c, pa_subscription_event_type_t t,
+subscribe_cb(pa_context *context, pa_subscription_event_type_t t,
uint32_t idx, void *userdata)
{
@@ -101,7 +96,7 @@ subscribe_cb(G_GNUC_UNUSED pa_context *c,
pa_subscription_event_type_t t,
else {
pa_operation *o;
- if (!(o = pa_context_get_sink_input_info(pm-context,
idx, sink_input_cb, pm))) {
+ if (!(o = pa_context_get_sink_input_info(context,
idx, sink_input_cb, pm))) {
g_debug(pa_context_get_sink_input_info()
failed);
return;
}
@@ -202,8 +197,9 @@ pulse_mixer_open(G_GNUC_UNUSED struct mixer *data)
return false;
}
+ pa_threaded_mainloop_lock(pm-mainloop);
if(!(pm-context =
pa_context_new(pa_threaded_mainloop_get_api(pm-mainloop),
- Mixer mpd))) {
+ Mixer MPD))) {
g_debug(failed context);
return false;
}
@@ -212,20 +208,21 @@ pulse_mixer_open(G_GNUC_UNUSED struct mixer *data)
if (pa_context_connect(pm-context, pm-server,
(pa_context_flags_t)0, NULL) 0) {
- g_debug(context server fail);
+ g_warning(Failed to connect to server: %s,
pa_strerror(pa_context_errno(pm-context)));
return false;
}
- pa_threaded_mainloop_lock(pm-mainloop);
if (pa_threaded_mainloop_start(pm-mainloop) 0) {
- g_debug(error start mainloop);
+ g_warning(Failed to start main loop);
return false;
}
+ /* Wait until the context is ready */
pa_threaded_mainloop_wait(pm-mainloop);
if (pa_context_get_state(pm-context) != PA_CONTEXT_READY) {
- g_debug(error context not ready);
+ g_warning(Failed to connect to server: %s,
pa_strerror(pa_context_errno(pm-context)));
+ pa_threaded_mainloop_unlock(pm-mainloop);
return false;
}
@@ -283,6 +280,8 @@ pulse_mixer_set_volume(struct mixer *mixer, unsigned
volume)
{
struct pulse_mixer *pm=(struct pulse_mixer *) mixer;
pa_operation *o;
+ g_debug(set_volume %s %d,
+ pm-online == TRUE ? online : offline, volume);
if (pm-online) {
pa_cvolume_set(pm-volume, (pm-volume)-channels,
(pa_volume_t)(volume)*PA_VOLUME_NORM/100+0.5);
Guess I'm an impatient guy. I had given up on you guys :). Well, the
good news is the problem doesn't exist anymore, the bad news is the
mixer doesn't do anything now ;)
Getting these once a second with
Re: [Musicpd-dev-team] [PATCH] pulse_mixer: clarify debug messages.
On Mon, Mar 16, 2009 at 3:52 PM, Avuton Olrich avu...@gmail.com wrote: On Mon, Mar 16, 2009 at 2:53 PM, David Guibert david.guib...@gmail.com wrote: Signed-off-by: David Guibert david.guib...@gmail.com --- Avuton, I hope this help to find which part clearly fails. It should give me more information about bugs - 2136 - 2138 - 2139 Guess I'm an impatient guy. I had given up on you guys :). Well, the good news is the problem doesn't exist anymore, the bad news is the mixer doesn't do anything now ;) Getting these once a second with gmpc open though. pulse_mixer: get_volume offline When I try to adjust I get: client: [1] process command setvol 100 pulse_mixer: set_volume offline 100 Nothing too eventful. Anything else I can help with? Thanks! Forgot to mention that before it /did/ adjust the volume, just in very erratic ways. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] http output configure.ac cleanups
Hi Max, Please pull from my tree, lots of cleanups for generalization post http output. The one patch removes unnecessary warnings against various optional libaries; if these warnings are going to be displayed they should only be when the user tries to enable them. -- Avuton Olrich (8): configure: replace all instances shout*[mp3|ogg] with [lame|oggvorbis]*encoder configure: Move encoders to their own report section. configure: Fail if trying to build with streaming output and no encoder configure: add shout autoconf argument. configure: Always run pkg-config for shout, define AC_DEFINE if enabled configure: error out against streaming output, not encoder. configure: don't warn just because we don't have an optional library. configure: Merge lame*encoder to lame configure.ac | 117 -- 1 files changed, 56 insertions(+), 61 deletions(-) diff --git a/configure.ac b/configure.ac index 283f5bc..06892be 100644 --- a/configure.ac +++ b/configure.ac @@ -504,7 +504,7 @@ dnl AC_ARG_ENABLE(lame, AS_HELP_STRING([--disable-lame], - [disable lame support (default: enable)]),, + [disable support for mp3 streaming (default: enable)]),, enable_lame=yes) @@ -558,15 +558,10 @@ AC_ARG_ENABLE(pulse, [disable support for the PulseAudio sound server (default: enable)]),, enable_pulse=yes) -AC_ARG_ENABLE(shout-ogg, - AS_HELP_STRING([--disable-shout-ogg], - [disable support for ogg streaming through shout (default: enable)]),, - [enable_shout_ogg=yes]) - -AC_ARG_ENABLE(shout-mp3, - AS_HELP_STRING([--disable-shout-mp3], - [disable support for mp3 streaming through shout (default: enable)]),, - [enable_shout_mp3=yes]) +AC_ARG_ENABLE(oggvorbis-encoder, + AS_HELP_STRING([--disable-oggvorbis-encoder], + [disable support for ogg streaming (default: enable)]),, + [enable_oggvorbis_encoder=yes]) AC_ARG_ENABLE(httpd-output, AS_HELP_STRING([--enable-httpd-output], @@ -588,24 +583,27 @@ esac AM_CONDITIONAL(HAVE_OSX, test x$enable_osx = xyes) -if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then - PKG_CHECK_MODULES([SHOUT], [shout],, - [enable_shout_ogg=no; enable_shout_mp3=no; - AC_MSG_WARN([disabling shout streaming support because libshout is not available])]) -fi +AC_ARG_ENABLE(shout, + AS_HELP_STRING([--enable-shout], + [enables the shoutcast streaming output (default: disable)]),, + [enable_shout=no]) + +PKG_CHECK_MODULES([SHOUT], [shout], + AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]), + enable_shout=no) -if test x$enable_shout_ogg = xyes; then +if test x$enable_oggvorbis_encoder = xyes; then if test x$enable_oggvorbis = xno; then AC_MSG_WARN([disabling ogg shout streaming support because vorbis is not enabled]) - enable_shout_ogg=no + enable_oggvorbis_encoder=no fi if test x$use_tremor = xyes; then AC_MSG_WARN([disabling ogg shout streaming support because tremor does not support vorbis encoding]) - enable_shout_ogg=no + enable_oggvorbis_encoder=no fi - if test x$enable_shout_ogg = xyes; then + if test x$enable_oggvorbis_encoder = xyes; then PKG_CHECK_MODULES(VORBISENC, [vorbisenc],, - enable_shout_ogg=no) + enable_oggvorbis_encoder=no) fi fi @@ -616,30 +614,16 @@ if test x$enable_lame = xyes; then AC_MSG_WARN(You need lame -- disabling lame support)]) fi -if test x$enable_shout_mp3 = xyes; then - if test x$enable_lame = xno; then - AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled]) - enable_shout_mp3=no - fi -fi - -if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then - enable_shout=yes - AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) -else - enable_shout=no -fi - AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) AM_CONDITIONAL(ENABLE_ENCODER, test x$enable_shout = xyes || test x$enable_httpd_output = xyes) -AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_shout_ogg = xyes) -if test x$enable_shout_ogg = xyes; then +AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_oggvorbis_encoder = xyes) +if test x$enable_oggvorbis_encoder = xyes; then AC_DEFINE(ENABLE_VORBIS_ENCODER, 1, [Define to enable the vorbis encoder plugin]) fi -AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_shout_mp3 = xyes) -if test x$enable_shout_mp3 = xyes; then +AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame = xyes) +if test x$enable_lame = xyes; then AC_DEFINE
Re: [Musicpd-dev-team] Mpd doesn't play ogg files
On Sat, Mar 14, 2009 at 2:11 PM, Damian damian.o...@gmail.com wrote: Hi Max, Thanks for your response. See if it's really enabled in mpd --version. I don't trust USE flags. Which version are you using, anyway? Here is the output of the command: mpd (MPD: Music Player Daemon) 0.13.2 Nearly prehistoric. Try a later version. Copyright (C) 2003-2007 Warren Dukes warren.du...@gmail.com This is free software; see the source for copying conditions. There is NO warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Supported formats: mp3 mp2 ogg oga ogg flac m4a mp4 Supported outputs: alsa I really don't know what to do. Start with updating as I recommend above, then if that doesn't work try starting it with /usr/bin/mpd --no-daemon --verbose --stdout to figure out what the issue is. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] copyright header updates
On Fri, Mar 13, 2009 at 11:06 AM, Avuton Olrich avu...@gmail.com wrote: To those that were CCd: Please read the following, this may affect you. Max, Please pull from my tree. This commit updates every single source file for consistancy and update of where to mail request for a copy of the GPL and the years of the MPD project. This also puts all committers under 'The Music Player Daemon Project' umbrella. These entries should go individually in the AUTHORS file, for consistancy. I have ommitted the diff as it would be pretty large and touches a large amount of the files. I don't have a real name for fluffy, so for now I have not added that author but it can easily be added at a later date. If you as an author disagree and want it your name and email readded to the source file, just say the word, I will make it happen. Amended and forced for AudioCompress stuff. To pull: git://git.musicpd.org/avuton/mpd.git To view: http://git.musicpd.org/cgit/avuton/mpd.git/commit/?id=a811195379235cf4ec129b43354a65ed77d3caf6 -- AUTHORS |4 src/ack.h| 13 +++-- src/aiff.c |7 --- src/aiff.h |7 --- src/archive/bz2_plugin.c | 13 +++-- src/archive/iso_plugin.c | 13 +++-- src/archive/zip_plugin.c | 13 +++-- src/archive_api.c| 14 +++--- src/archive_api.h| 13 +++-- src/archive_internal.h | 13 +++-- src/archive_list.c | 13 +++-- src/archive_list.h | 13 +++-- src/audio.c | 13 +++-- src/audio.h | 13 +++-- src/audioOutput.c| 13 +++-- src/audioOutput.h| 13 +++-- src/audio_format.h | 13 +++-- src/audio_parser.c |7 --- src/audio_parser.h |7 --- src/buffer.c |7 --- src/buffer.h |7 --- src/buffer2array.c | 13 +++-- src/buffer2array.h | 13 +++-- src/chunk.c |7 --- src/chunk.h |7 --- src/client.c | 13 +++-- src/client.h | 13 +++-- src/cmdline.c|9 + src/cmdline.h|9 + src/command.c| 13 +++-- src/command.h| 13 +++-- src/compress.c | 19 ++- src/compress.h | 19 ++- src/conf.c | 13 +++-- src/conf.h | 13 +++-- src/crossfade.c | 14 +++--- src/crossfade.h | 14 +++--- src/daemon.c |9 + src/daemon.h |9 + src/database.c | 14 +++--- src/database.h | 14 +++--- src/dbUtils.c| 13 +++-- src/dbUtils.h| 13 +++-- src/decoder/_flac_common.c | 20 +++- src/decoder/_flac_common.h | 20 +++- src/decoder/_ogg_common.c| 20 +++- src/decoder/_ogg_common.h| 20 +++- src/decoder/audiofile_plugin.c | 17 - src/decoder/faad_plugin.c| 15 --- src/decoder/ffmpeg_plugin.c | 13 +++-- src/decoder/flac_plugin.c| 13 +++-- src/decoder/fluidsynth_plugin.c |7 --- src/decoder/mad_plugin.c | 13 +++-- src/decoder/mikmod_plugin.c | 15 --- src/decoder/modplug_plugin.c | 13 +++-- src/decoder/mp4ff_plugin.c | 13 +++-- src/decoder/mpcdec_plugin.c | 13 +++-- src/decoder/oggflac_plugin.c | 20 +++- src/decoder/sidplay_plugin.cxx |7 --- src/decoder/vorbis_plugin.c | 13 +++-- src/decoder/wavpack_plugin.c | 15 +++ src/decoder/wildmidi_plugin.c|7 --- src/decoder_api.c| 14 +++--- src/decoder_api.h| 14 +++--- src/decoder_buffer.c |7 --- src/decoder_buffer.h |7 --- src/decoder_command.h|7 --- src/decoder_control.c| 13 +++-- src/decoder_control.h| 14 +++--- src/decoder_internal.c |7 --- src/decoder_internal.h | 13 +++-- src/decoder_list.c | 13 +++-- src/decoder_list.h | 13
[Musicpd-dev-team] [git pull] configure.ac cleanups (part 2)
Hi max, Please pull from my tree, a few fixes you've asked for, a few that seemed logical to me. configure.ac is still in complete disarray, but these are some steps forward, I believe. The only one that seems iffy to me is 'don't include a help string with the --enable-mp3', if I don't include one it appears ac will make a blank space regardless. If it were my project I'd say screw backwards compatbility of configure arguments :). git://git.musicpd.org/ Not inlining the diff, it's around 1200 lines and who knows the limits of hte mailing list. To see it: http://avuton.googlepages.com/autoconf-cleanups.patch Avuton Olrich (11): configure: remove redundant explicit $enableval assignments. configure: Group libmad stuff together, rename --enable-mp3 --enable-mad configure: trim down the Tremor AC_ARG_WITH() statements configure: trim down the line length for the lame arguments configure: trim down the line length for the zeroconf help string configure: trim down the line length for the faad help strings configure: trim down the line length for the libOggFLAC help strings configure: specify that faad2 prefix is optional in the help string configure: No capitalization on beginning of help strings. configure: Move the faad stuff to m4/faad.m4 configure: global indention and trim line wc to 80 when practical. configure.ac | 525 -- m4/faad.m4 | 190 m4/lame.m4 | 20 ++- m4/libOggFLAC.m4 | 20 ++- -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] configure.ac cleanups
Avuton Olrich (4): configure: Fix configure warning presented by lastfm radio. configure: more complete autoconf stuff for lastfm configure: display the status of lastfm protocol support configure: Add 'Streaming Support' section to the configure display. configure.ac | 44 +++- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 1e16690..de7ddcd 100644 --- a/configure.ac +++ b/configure.ac @@ -255,7 +255,8 @@ AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes) AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], - [enable support for last.fm radio (default: disable)]),, + [enable support for last.fm radio (default: disable)]), + [enable_lastfm=$enableval], [enable_lastfm=no]) if test x$enable_lastfm = xyes; then @@ -263,7 +264,7 @@ if test x$enable_lastfm = xyes; then AC_MSG_ERROR([Cannot enable last.fm radio without curl]) fi - AC_DEFINE(ENABLE_LASTFM, 1, [Define when last.fm radio is enabled]), + AC_DEFINE(ENABLE_LASTFM, 1, [Define when last.fm radio is enabled]) fi AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes) @@ -1445,24 +1446,39 @@ else fi echo -echo Other features: +echo Streaming support: + +if test x$enable_lame = xyes; then +echo lame support (mp3 output) .enabled +else +echo lame support (mp3 output) .disabled +fi + +if test x$enable_lastfm = xyes; then +echo last.fm radio support .enabled +else +echo last.fm radio support .disabled +fi if test x$enable_curl != xno; then - echo HTTP streaming (libcurl) ..enabled +echo libcurl support (streaming) ...enabled else - echo HTTP streaming (libcurl) ..disabled +echo libcurl support (streaming) ...disabled fi -if test x$enable_id3 = xyes; then - echo ID3 tag support ...enabled +if test x$enable_mms != xno; then +echo libmms support enabled else - echo ID3 tag support ...disabled +echo libmms support disabled fi -if test x$enable_lame = xyes; then - echo lame support ..enabled +echo +echo Other features: + +if test x$enable_id3 = xyes; then + echo ID3 tag support ...enabled else - echo lame support ..disabled + echo ID3 tag support ...disabled fi if test x$enable_lsr = xyes; then @@ -1471,12 +1487,6 @@ else echo libsamplerate support .disabled fi -if test x$enable_mms != xno; then - echo MMS streaming (libmms) enabled -else - echo MMS streaming (libmms) disabled -fi - if test x$with_zeroconf != xno; then echo Zeroconf support ..$with_zeroconf else -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] configure.ac cleanups
On Thu, Mar 5, 2009 at 9:53 PM, Max Kellermann m...@duempel.org wrote: On 2009/03/06 01:49, Avuton Olrich avu...@gmail.com wrote: echo -echo Other features: +echo Streaming support: + +if test x$enable_lame = xyes; then + echo lame support (mp3 output) .enabled +else + echo lame support (mp3 output) .disabled +fi I'm not quite satisfied with this. The last patch is an overall improvement, but I don't see why LAME support should appear twice. We should probably write only one shout line, and create a new section for encoder plugins (lame + vorbis). Can you do that, please? All patches except more complete autoconf stuff for lastfm merged. Well, that was not intentional. Not exactly what you asked for, but hopefully this will float the boat. Avuton Olrich (2): configure: make all tests the same, when possible. configure: remove duplicate LAME report, unify rest under SHOUTcast header. configure.ac | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index a3d929b..0bc29a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1271,16 +1271,22 @@ else echo Media MVP support .disabled fi -if test x$enable_shout_ogg = xyes; then - echo Shout ogg streaming support ...enabled -else - echo Shout ogg streaming support ...disabled -fi +if test x$enable_shout = xyes; then + echo SHOUTcast support .enabled -if test x$enable_shout_mp3 = xyes; then - echo Shout mp3 streaming support ...enabled + if test x$enable_shout_mp3 = xyes; then + echowith LAME mp3 encoder ...enabled + else + echowith LAME mp3 encoder ...disabled + fi + + if test x$enable_shout_ogg = xyes; then + echowith Ogg Vorbis encoder .enabled + else + echowith Ogg Vorbis encoder .disabled + fi else - echo Shout mp3 streaming support ...disabled + echo SHOUTcast support .disabled fi echo @@ -1447,25 +1453,19 @@ fi echo echo Streaming support: -if test x$enable_lame = xyes; then -echo lame support (mp3 output) .enabled -else -echo lame support (mp3 output) .disabled -fi - if test x$enable_lastfm = xyes; then echo last.fm radio support .enabled else echo last.fm radio support .disabled fi -if test x$enable_curl != xno; then +if test x$enable_curl = xyes; then echo libcurl support (streaming) ...enabled else echo libcurl support (streaming) ...disabled fi -if test x$enable_mms != xno; then +if test x$enable_mms = xyes; then echo libmms support enabled else echo libmms support disabled -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] Print supported protocols on --version
Hi Max,
This patch simply prints the available protocols when --version is executed.
git://git.musicpd.org/avuton/mpd.git
Avuton Olrich (1):
cmdline: Print available protocols when --version is run.
NEWS |1 +
src/cmdline.c |5 +
src/ls.c | 20
src/ls.h |6 ++
4 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/NEWS b/NEWS
index 84b5e6a..4df9486 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,7 @@ ver 0.15 - (200?/??/??)
* daemon: ignore user setting if already running as that user
* listen: fix broken client IP addresses in log
* 32 bit audio support
+* Print available protocols in --version
ver 0.14.2 (2009/02/13)
diff --git a/src/cmdline.c b/src/cmdline.c
index b0cdbfb..e37cea7 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -23,6 +23,7 @@
#include decoder_list.h
#include config.h
#include audioOutput.h
+#include ls.h
#ifdef ENABLE_ARCHIVE
#include archive_list.h
@@ -63,6 +64,10 @@ static void version(void)
archive_plugin_print_all_suffixes(stdout);
#endif
+ puts(\n
+ Supported protocols:\n);
+ print_supported_uri_schemes_to_fp(stdout);
+
exit(EXIT_SUCCESS);
}
diff --git a/src/ls.c b/src/ls.c
index c6987ae..679017e 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -24,6 +24,12 @@
#include assert.h
#include string.h
+
+/**
+ * file:// is not included in remoteUrlPrefixes, the connection method
+ * is detected at runtime and displayed as a urlhandler if the client is
+ * connected by IPC socket.
+ */
static const char *remoteUrlPrefixes[] = {
#ifdef HAVE_CURL
http://;,
@@ -40,6 +46,20 @@ static const char *remoteUrlPrefixes[] = {
NULL
};
+void print_supported_uri_schemes_to_fp(FILE *fp)
+{
+ const char **prefixes = remoteUrlPrefixes;
+
+#ifdef HAVE_UN
+ fprintf(fp,file:// , *prefixes);
+#endif
+ while (*prefixes) {
+ fprintf(fp,%s , *prefixes);
+ prefixes++;
+ }
+ puts(\n);
+}
+
void print_supported_uri_schemes(struct client *client)
{
const char **prefixes = remoteUrlPrefixes;
diff --git a/src/ls.h b/src/ls.h
index d6e4c98..f86845e 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -20,6 +20,7 @@
#define MPD_LS_H
#include stdbool.h
+#include stdio.h
struct client;
@@ -36,4 +37,9 @@ bool uri_supported_scheme(const char *url);
*/
void print_supported_uri_schemes(struct client *client);
+/**
+ * Send a list of supported URI schemes to a file pointer.
+ */
+void print_supported_uri_schemes_to_fp(FILE *fp);
+
#endif
--
avuton
--
| (\_/) This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| ()_() world domination.
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] Print supported protocols on --version
On Tue, Mar 3, 2009 at 12:25 PM, Max Kellermann m...@duempel.org wrote: On 2009/03/03 17:07, Avuton Olrich avu...@gmail.com wrote: Hi Max, This patch simply prints the available protocols when --version is executed. Merged. + fprintf(fp,file:// , *prefixes); Fixed this one. *Sigh*, only looked at that forever, though your patch made me realize I puts later on, please pull again for that fix: Avuton Olrich (1): ls: Print output of supported uri to fp rather than stdout. src/ls.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ls.c b/src/ls.c index 92b8a21..aa587f1 100644 --- a/src/ls.c +++ b/src/ls.c @@ -57,7 +57,7 @@ void print_supported_uri_schemes_to_fp(FILE *fp) fprintf(fp, %s , *prefixes); prefixes++; } - puts(\n); + fprintf(fp,\n); } void print_supported_uri_schemes(struct client *client) -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] configure improvements
Hi Max, This patchset includes various improvements to the configure. configure.ac | 214 ++ 1 files changed, 111 insertions(+), 103 deletions(-) Avuton Olrich (5): pipe: Fix wording in configure and add configure status. configure: move the configure status stuff in alphabetical order. configure: don't fail if mp4 is the only enabled input plugin. configure: move id3 and lame to 'Other Features' configure: don't fail if pipe_output is the only output plugin. diff --git a/configure.ac b/configure.ac index d71d3eb..d1d887d 100644 --- a/configure.ac +++ b/configure.ac @@ -499,7 +499,7 @@ AC_ARG_ENABLE(fifo, AC_ARG_ENABLE(pipe-output, AS_HELP_STRING([--enable-pipe-output], - [disable support for writing audio to a pipe (default: disable)]),, + [enable support for writing audio to a pipe (default: disable)]),, enable_pipe_output=no) if test x$enable_pipe_output = xyes; then @@ -1177,18 +1177,18 @@ echo ### MPD CONFIGURATION echo echo Client Support: -if test x$enable_tcp = xyes; then - echo TCP support ...enabled -else - echo TCP support ...disabled -fi - if test x$enable_ipv6 = xyes; then echo IPv6 support ..enabled else echo IPv6 support ..disabled fi +if test x$enable_tcp = xyes; then + echo TCP support ...enabled +else + echo TCP support ...disabled +fi + if test x$enable_un = xyes; then echo Unix domain socket support enabled else @@ -1204,46 +1204,52 @@ if fi echo Playback Support: -if test x$enable_ao = xyes; then - echo libao support .enabled -else - echo libao support .disabled -fi - -if test x$enable_oss = xyes; then - echo OSS support ...enabled -else - echo OSS support ...disabled -fi - if test x$enable_alsa = xyes; then echo ALSA support ..enabled else echo ALSA support ..disabled fi +if test x$enable_fifo = xyes; then + echo FIFO support ..enabled +else + echo FIFO support ..disabled +fi + if test x$enable_jack = xyes; then echo JACK support ..enabled else echo JACK support ..disabled fi +if test x$enable_ao = xyes; then + echo libao support .enabled +else + echo libao support .disabled +fi + +if test x$enable_oss = xyes; then + echo OSS support ...enabled +else + echo OSS support ...disabled +fi + if test x$enable_osx = xyes; then echo OS X support ..enabled else echo OS X support ..disabled fi -if test x$enable_pulse = xyes; then - echo PulseAudio support enabled +if test x$enable_pipe_output = xyes; then + echo Pipeline output support ...enabled else - echo PulseAudio support disabled + echo Pipeline output support ...disabled fi -if test x$enable_fifo = xyes; then - echo FIFO support ..enabled +if test x$enable_pulse = xyes; then + echo PulseAudio support enabled else - echo FIFO support ..disabled + echo PulseAudio support disabled fi if test x$enable_mvp = xyes; then @@ -1275,39 +1281,29 @@ if test x$enable_ao = xno test x$enable_pulse = xno test x$enable_jack = xno test x$enable_fifo = xno + test x$enable_pipe_output = xno test x$enable_mvp = xno; then AC_MSG_ERROR([No Audio Output types configured!]) fi echo File Format Support: -if test x$enable_id3 = xyes; then - echo ID3 tag support ...enabled -else - echo ID3 tag support ...disabled -fi - -if test x$enable_mp3 = xyes; then - echo mp3 support ...enabled +if test x$enable_aac = xyes; then + echo AAC support ...enabled else - echo mp3 support ...disabled + echo AAC support ...disabled fi -if test x$enable_lame = xyes; then -echo lame support ..enabled +if test x$enable_sidplay = xyes; then + echo C64 SID support ...enabled else -echo lame support ..disabled + echo C64 SID support ...disabled fi -if test x$enable_oggvorbis = xyes; then - echo Ogg Vorbis support enabled - if test x$use_tremor = xyes; then - echousing tremor.yes - else - echousing tremor.no - fi +if test x$enable_ffmpeg = xyes; then + echo FFMPEG
[Musicpd-dev-team] [git pull] mixer_type disabled
Hi Max,
This patch adds the disabled mixer type to not allow MPD to touch
the mixer. This fixes bug 2094.
git://git.musicpd.org/avuton/mpd.git
doc/mpd.conf.5 |2 +-
doc/mpdconf.example |4
src/volume.c|3 +++
src/volume.h|1 +
4 files changed, 9 insertions(+), 1 deletions(-)
Avuton Olrich (1):
mixer: Add disabled mixer_type.
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index e375de1..592398a 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -163,7 +163,7 @@ Linear interpolator, very fast, poor quality.
For an up-to-date list of available converters, please see the libsamplerate
documentation (available online at \fBhttp://www.mega-nerd.com/SRC/\fP).
.TP
-.B mixer_type alsa, oss, software or hardware
+.B mixer_type alsa, oss, software, hardware or disabled
This specifies which mixer to use. The default is hardware and depends on
what audio output support mpd was built with. Options alsa and oss are
legacy and should not be used in new configs, but when set mixer_device
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index ba9a74e..5b19c02 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -245,6 +245,10 @@ log_file ~/.mpd/log
#
#mixer_typesoftware
#
+# This example will not allow MPD to touch the mixer at all.
+#
+#mixer_typedisabled
+#
###
diff --git a/src/volume.c b/src/volume.c
index 5017910..c5c1e83 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -36,6 +36,7 @@
#define VOLUME_MIXER_TYPE_SOFTWARE 0
#define VOLUME_MIXER_TYPE_HARDWARE 1
+#define VOLUME_MIXER_TYPE_DISABLED 2
#define VOLUME_MIXER_SOFTWARE_DEFAULT
#define SW_VOLUME_STATE sw_volume:
@@ -131,6 +132,8 @@ void volume_init(void)
if (param) {
if (strcmp(param-value, VOLUME_MIXER_SOFTWARE) == 0) {
volume_mixer_type = VOLUME_MIXER_TYPE_SOFTWARE;
+ } else if (strcmp(param-value, VOLUME_MIXER_DISABLED) == 0) {
+ volume_mixer_type = VOLUME_MIXER_TYPE_DISABLED;
} else if (strcmp(param-value, VOLUME_MIXER_HARDWARE) == 0) {
//nothing to do
} else {
diff --git a/src/volume.h b/src/volume.h
index fbf86df..950f26e 100644
--- a/src/volume.h
+++ b/src/volume.h
@@ -25,6 +25,7 @@
#define VOLUME_MIXER_ALSA alsa
#define VOLUME_MIXER_SOFTWARE software
#define VOLUME_MIXER_HARDWARE hardware
+#define VOLUME_MIXER_DISABLED disabled
void volume_init(void);
--
avuton
--
| (\_/) This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| ()_() world domination.
--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] The quest for ffmpeg file format perfection
On Sun, Feb 22, 2009 at 2:45 PM, Max Kellermann m...@duempel.org wrote: On 2009/02/22 18:50, Avuton Olrich avu...@gmail.com wrote: Here's a copy of the output from ffmpeg (20090201), I realize this probably isn't complete, but the only way I can imagine getting better results is to probe formats. Currently, the MPD decoder API expects a compile-time fixed list of extensions and MIME types, so this would be the way to go. Having too many formats in there doesn't hurt (except for little performance degradation), so just add everything which is supported by latest ffmpeg. Care to convert this list to a MPD patch? (only audio formats) - you could write a small perl script to convert the output.. and then delete those which don't have audio. I don't mind at all making a patch, but this will be mostly manual. This script simply exposes all the formats, I'll have to grok the internet to get the applicable extensions, since ffmpeg doesn't even have some extensions, it simply probes for the correct information. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] pulse audio mixer
On Thu, Jan 8, 2009 at 4:06 PM, Linel Patrice patnathan...@gmail.com wrote: Hi, I want to know if you have in mind to develop the mixer for pulse audio? If no , why? Software works fine, and if you have 1 output with mixed types then this is really your only solution. So, I would hope being able to mix software and hardware mixers would come first. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] pulse audio mixer
On Thu, Jan 8, 2009 at 4:32 PM, Patrice patnathan...@gmail.com wrote: I saw the software mixer work. But it is ,in my opinion, better if when i set the the volume in mpd, it affect the pulse volume which is only the mpd one. I work on that and i already have a working version. Could this interest the community? Of course that's good. Interested in a git tree, or do you possibly want to just post patches here? If you want a git tree send me your pub key privately. -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Plans for MPD 0.15
On Fri, Jan 2, 2009 at 12:23 AM, Max Kellermann m...@duempel.org wrote: - UPnP/DLNA server http://musicpd.org/mantis/view.php?id=1924 Couldn't tell if it's a dupe or not, but we have this too. http://musicpd.org/mantis/view.php?id=1670 -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] update copyright notices
Happy new year all, I wanted to work on updating copyright notices for the new year (yeah, yeah, I don't have plans to do anything ;)). So Max, please pull the following: git://git.musicpd.org/avuton/mpc.git git://git.musicpd.org/avuton/mpdscribble.git The last one is touchy and we may need to get some feedback on this. I changed all authors copyrights to (C) 2004-2009 The MPD Project, as there are many different authors and maintainers. This may upset some folks who may be touchy who may look at this as me stripping their copyright from the header, which is not my intention. The facts are setup in git repos forever. They're not going anywhere, nor is the history thereof. OTOH, do we need, want, permission to reassign to this The MPD project? Do we just want to strip it completely as is done in many projects? In linux: Usually done per file, kept to one person who authored the file in the beginning, sometimes changed. In firefox: A huge license block with the history of the entire file. In apache: Shows nothing but a small snippet of the license and a link to it. Personally, I think the apache route is the most reasonable, but I don't want to offend anyone by stripping their copyright off the top. What do we think? git://git.musicpd.org/avuton/ncmpc.git (btw- the exhaustion of thinking of this caused me to hold off on the mpd repo ;)) -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] Archive API merged
On Sat, Dec 27, 2008 at 5:38 AM, Max Kellermann m...@duempel.org wrote: Hi Viliam, I have merged the archive API from your experimental branch. Please have a look at the 3 patches I added (2 for archive, 1 for audiofile): Max Certainly, this isn't right: From configure: --enable-bz2enable rar archive support (default: disabled) -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] mpd-0.14 released
Well, Here's the big one. mpd-0.14 released. More changes than you can shake a stick at. An amazing amount of changes. This isn't all of them, not by far. Thanks to all the contributors and community at large. Go get it: http://downloads.sourceforge.net/musicpd/mpd-0.14.tar.bz2 Report bugs: http://musicpd.org/mantis NEWS: * audio outputs: - wait 10 seconds before reopening a failed device - fifo: new plugin - null: new plugin - shout: block while trying to connect instead of failing - shout: new timeout parameter - shout: support mp3 encoding and the shoutcast protocol - shout: send silence during pause, so clients don't get disconnected * decoders: - ffmpeg: new plugin - wavpack: new plugin - aac: stream support added - mod: disabled by default due to critical bugs in all libmikmod versions * commands: - addid takes optional second argument to specify position - idle notifies the client when a notable change occurs * Zeroconf support using Bonjour * New zeroconf_enabled option so that Zeroconf support can be disabled * Stop the player/decode processes when not playing to allow the CPU to sleep * Fix a bug where closing an ALSA dmix device could cause MPD to hang * Support for reading ReplayGain from LAME tags on MP3s * MPD is now threaded, which greatly improves performance and stability * memory usage reduced by merging duplicate tags in the database * support connecting via unix domain socket * allow authenticated local users to add any local file to the playlist * 24 bit audio support * optimized PCM conversions and dithering * much code has been replaced by using GLib * the HTTP client has been replaced with libcurl * symbolic links in the music directory can be disabled; the default is to ignore symlinks pointing outside the music directory * idle command -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] mpdscribble-0.14 released
This release has the normal bugfixes, cleans up the source code to be much more readable, supports MPD's idle command, uses more glib code, logs to syslog, resubmits now playing after re-handshake and much more. Pick it up at: http://downloads.sourceforge.net/musicpd/mpdscribble-0.14.tar.bz2 Report bugs at: http://musicpd.org/mantis/ -- Avuton Olrich (7): Move source and header files under the src/ directory. Make a proper doc/ directory Add the makefile template Update COPYING Add setup.sh to the EXTRA_DIST so it gets distributed with the tarball. Fix distcheck by giving the leading directory for libmpdclient's header when it is included. mpdscribble version 0.14 Max Kellermann (78): configure.ac: set version number to 0.14~git .gitignore update reindent all files as: converted runtime checks to assertions as: use unsigned integers as: don't allocate empty strings as: reset interval after successful submit as: don't duplicate twice in as_handshake_callback() as: return from as_handshake_callback() on success as: reset interval after handshake response was parsed completely as: removed AS_SUBMIT_NOP as: don't reset g_state in as_parse_submit_response() as: set state NOTHING/READY at the beginning of function as: make as_parse_handshake_response() return a bool as: abort earlier on handshake error as: pass length to as_parse_submit_response() as: parse only the first submit response line use GLib's main loop conn: don't parse URI with soup_uri_new() submit song when stopped removed the submitted variable file: make the logfile unbuffered splitted the timer_mpd_update() function moved timer_mpd_update() to lmc.c lmc: use a second-granularity timer lmc: reconnect with a separate timer libmpdclient: don't clear notify_cb before mpd_readChanges() lmc: support MPD's idle command lmc: replace '||' with '' in libmpdclient error check as: reuse as_submit_callback() for now playing moved journal code to journal.c journal: renamed functions from file/cache to journal journal: return from journal_read() if file cannot be read journal: read and parse line by line journal: parse without regular expressions journal: close the journal file after reading lmc: replace '||' with '' in libmpdclient error check journal: journal_read() returns void, journal_write() returns bool journal: convert file_saved_count to a boolean flag as: use GQueue for the submit queue journal: commit song on the next artist line journal: append to queue instead of as_songchange() lmc: free current_song on shutdown as: resubmit now playing after re-handshake NEWS: added missing 0.14 changes main: moved code to setup_signals() main: set up signal handlers with sigaction() ignore SIGPIPE misc: removed now() log: new logging subsystem based on GLib logging use GLib logging as: fall back to libgcrypt for MD5 hashing as: use soup_uri_encode() on GLib 2.16 lmc: check if g_timeout_add_seconds() is available Makefile.am: no recursive makefiles Makefile.am: added sparse-check target lmc: use NULL instead of 0 for pointers log: moved file_open_logfile() from file.c libmpdclient: removed example.c log: moved code to log_init_file() log: added support for syslog close stdin close stdout and stderr file: removed file_open_logfile() prototype file: make file_expand_tilde() static file: moved macros from header to file.c file: moved code to cmdline.c file: moved code to load_config_file() file: missing config file is a fatal error file: parse command line arguments before config file cmdline: use GLib's command line parser as: fixed GLib version check for GLib = 3.0 cmdline: exit(0) after --version cmdline: don't print AS client id in --version doc: added a sample mpdscribble.conf added new INSTALL file with compiling instructions deleted setup.sh README: miscellaneous updates, new formatting -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] mpc-0.14 release
On Mon, Dec 22, 2008 at 5:11 AM, Jerome Quelin jque...@gmail.com wrote: On 08/12/20 07:40 -0800, Avuton Olrich wrote: First release in a year and a half. Go get it. Really. Then report bugs at our bug tracker. it would be nice to provide the official url to tarball :-) jérôme http://downloads.sourceforge.net/musicpd/mpc-0.14.tar.bz2 -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] mpdscribble GNU style directories + fixes
Max, Here's some changes and a couple of bugfixes. The diff below will only have the non-move/COPYING changes; one of them I'm not 100% sure is correct, the #include, but it does seem to compile and it allows make distcheck to work. Please pull from: git://git.musicpd.org/avuton/mpdscribble.git gnu_style_directories -- Avuton Olrich (6): Move source and header files under the src/ directory. Make a proper doc/ directory Add the makefile template Update COPYING Add setup.sh to the EXTRA_DIST so it gets distributed with the tarball. Fix distcheck by giving the leading directory for libmpdclient's header when it is included. -- diff --git a/Makefile.am b/Makefile.am index 1335fd5..d32d912 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2 doc_DATA = README AUTHORS NEWS -EXTRA_DIST = $(man_MANS) +EXTRA_DIST = $(man_MANS) setup.sh SUBDIRS = doc src diff --git a/src/lmc.h b/src/lmc.h index 6e4dd5f..bc2b7b9 100644 --- a/src/lmc.h +++ b/src/lmc.h @@ -23,7 +23,7 @@ #ifndef LMC_H #define LMC_H -#include libmpdclient.h +#include libmpdclient/libmpdclient.h #include stdio.h void lmc_connect(char *host, int port); -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [git pull] mpc *handler fixes
Max, Please pull the latest *handler script improvements from my tree from: git://git.musicpd.org/avuton/mpc.git handler-fixes They should all be posix compatible and they'll fix 1709. -- Avuton Olrich (6): Move the 'handlers' to show the they are specifically for MPD, in the case they end up installed. Rather then put examples of how to parse playlist entries with mpc in the man page, refer to the scripts that are distributed in the doc directory. Don't automatically assume the user wants their old playlist cleared and to play after a playlist is added. Quote parameter expansions. Rather then pipe use a file redirector. Remove the unnecessary grep by excluding streams then printing only when necessary. diff --git a/doc/m3u-handler.sh b/doc/m3u-handler.sh deleted file mode 100755 index f8d76dd..000 --- a/doc/m3u-handler.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -test $# -ne 1 echo $0 takes 1 argument exit 1 -test ! -e $1 echo Argument ($1) needs to be a file exit 2 -mpc clear -cat $1 | mpc add -mpc play diff --git a/doc/mpc.1 b/doc/mpc.1 index 81b17a6..0103737 100644 --- a/doc/mpc.1 +++ b/doc/mpc.1 @@ -156,30 +156,8 @@ via Unix Domain Socket. To use a password with mpd, set MPD_HOST to passw...@host. .SH EXAMPLES .TP -Here is a script to load and play m3u playlists (useful for mozilla): .br - -.br -#!/bin/bash -.br -mpc clear -.br -cat $1 | mpc add -.br -mpc play -.br -.TP -This script can be used to load and play pls playlists (again, useful for mozilla): -.br - -.br -#!/bin/bash -.br -mpc clear -.br -grep '^File[0-9]*' $1 | sed -e 's/^File[0-9]*=//' | mpc add -.br -mpc play +For useful examples of mpc use in playlist parsing, see mpd-m3u-playlist.sh and mpd-pls-playlist.sh. .br .SH BUGS Report bugs on http://www.musicpd.org/mantis/ diff --git a/doc/mpd-m3u-handler.sh b/doc/mpd-m3u-handler.sh new file mode 100755 index 000..8868403 --- /dev/null +++ b/doc/mpd-m3u-handler.sh @@ -0,0 +1,4 @@ +#!/bin/sh +test $# -ne 1 echo $0 takes 1 argument exit 1 +test ! -e $1 echo Argument ($1) needs to be a file exit 2 +mpc add $1 diff --git a/doc/mpd-pls-handler.sh b/doc/mpd-pls-handler.sh new file mode 100755 index 000..55aa77d --- /dev/null +++ b/doc/mpd-pls-handler.sh @@ -0,0 +1,4 @@ +#!/bin/sh +test $# -ne 1 echo $0 takes 1 argument exit 1 +test ! -e $1 echo Argument ($1) needs to be a file exit 2 +sed -ne 's/^File[0-9]*=//p' $1 | mpc add diff --git a/doc/pls-handler.sh b/doc/pls-handler.sh deleted file mode 100755 index 1f41558..000 --- a/doc/pls-handler.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -test $# -ne 1 echo $0 takes 1 argument exit 1 -test ! -e $1 echo Argument ($1) needs to be a file exit 2 -mpc clear -grep '^File[0-9]*' $1 | sed -e 's/^File[0-9]*=//' | mpc add -mpc play -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] mpc *handler fixes
On Sat, Dec 20, 2008 at 3:24 PM, Max Kellermann m...@duempel.org wrote: On 2008/12/20 20:36, Avuton Olrich avu...@gmail.com wrote: Please pull the latest *handler script improvements from my tree from: Done! Whoops! Please repull, this time includes the necessary makefile changes (guess I should smoke check even for documentation changes ;)). Thanks! git://git.musicpd.org/avuton/mpc.git handler-fixes -- Avuton Olrich (1): Fix the makefile to deal with the renamed scripts. diff --git a/doc/Makefile.am b/doc/Makefile.am index 6252bdb..2b2b77a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ man_MANS = mpc.1 pkgdata_DATA = docdir = $(prefix)/share/doc/$(PACKAGE) -doc_DATA = mpc-bashrc m3u-handler.sh pls-handler.sh mppledit +doc_DATA = mpc-bashrc mpd-m3u-handler.sh mpd-pls-handler.sh mppledit EXTRA_DIST = $(pkgdata_DATA) $(man_MANS) $(doc_DATA) -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] [git pull] mpd documentation updates
On Sat, Dec 20, 2008 at 10:25 PM, Avuton Olrich avu...@gmail.com wrote: I'll reply with the patch, as it might not get through due to size. diff --git a/COPYING b/COPYING index d60c31a..d511905 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -303,17 +303,16 @@ the copyright line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: -Gnomovision version 69, Copyright (C) year name of author +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/INSTALL b/INSTALL index b1a24fd..cb58a5c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,12 @@ Music Player Daemon (MPD) - INSTALL +Introduction
[Musicpd-dev-team] [git pull] Remove obsolete http_buffer* stuff.
Max, Please pull the http_buffer* removal stuff from: git://git.musicpd.org/avuton/mpd.git http_buffer_remove -- Avuton Olrich (1): Remove obsolete http_buffer* stuff that went away with the new curl backend. -- diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 31b105c..8cc3b05 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -192,14 +192,6 @@ song. Try increasing this if you hear skipping when manually changing songs. The default is 10%, a little over 1 second of CD-quality audio with the default buffer size. .TP -.B http_buffer_size size in KiB -This specifies the size of the buffer used for playing HTTP streams. The -default is 128. -.TP -.B http_prebuffer_size size in KiB -This specifies how much of an HTTP stream should be buffered before beginning -playback. The default is 32. -.TP .B http_proxy_host hostname Use to specify the proxy host used for HTTP connections. .TP diff --git a/src/conf.c b/src/conf.c index cdcb917..680a5fb 100644 --- a/src/conf.c +++ b/src/conf.c @@ -171,8 +171,6 @@ void initConf(void) registerConfigParam(CONF_SAMPLERATE_CONVERTER, 0, 0); registerConfigParam(CONF_AUDIO_BUFFER_SIZE, 0, 0); registerConfigParam(CONF_BUFFER_BEFORE_PLAY,0, 0); - registerConfigParam(CONF_HTTP_BUFFER_SIZE, 0, 0); - registerConfigParam(CONF_HTTP_PREBUFFER_SIZE, 0, 0); registerConfigParam(CONF_HTTP_PROXY_HOST, 0, 0); registerConfigParam(CONF_HTTP_PROXY_PORT, 0, 0); registerConfigParam(CONF_HTTP_PROXY_USER, 0, 0); diff --git a/src/conf.h b/src/conf.h index e2e50c5..2b73bb6 100644 --- a/src/conf.h +++ b/src/conf.h @@ -49,8 +49,6 @@ #define CONF_SAMPLERATE_CONVERTER samplerate_converter #define CONF_AUDIO_BUFFER_SIZE audio_buffer_size #define CONF_BUFFER_BEFORE_PLAY buffer_before_play -#define CONF_HTTP_BUFFER_SIZE http_buffer_size -#define CONF_HTTP_PREBUFFER_SIZEhttp_prebuffer_size #define CONF_HTTP_PROXY_HOSThttp_proxy_host #define CONF_HTTP_PROXY_PORThttp_proxy_port #define CONF_HTTP_PROXY_USERhttp_proxy_user -- avuton -- | (\_/) This is Bunny. Copy and paste Bunny | (='.'=) into your signature to help him gain | ()_() world domination. -- ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] For the record (about git.musicpd.org)
I don't like disagreeing with the general direction of anything MPD as I'm not a devoper but I really hate our git.musicpd.org direction. For the record, I (still) think we should move everything from git.musicpd.org to repo.or.cz and redirect git.musicpd.org to http://repo.or.cz/?by_tag=mpd. git.musicpd.org is far too unstable and again, depending on others to make sure things work as expected is not really good for the long term. repo.or.cz has worked at least since the beginning of 2007 afaik and there has only been one time it has been down in my experience and that was just the git server (the web/http interfaces continued working). Not only that but it is self-administrating (except for repo removal) which will help us all just work and not waste our time with the details. And this is not an I told you so but, for the record, I do think we jumped into this too quickly, as I feared we would. Please consider this, weather or not the stability of git.musicpd.org can be improved. So, to break this down. git.musicpd.org - repo.or.cz/?by_tag=mpd Pros/Cons over current situation: Pros: Greater Stability - I do realize this can be improved with our current situation Improved Community - Anyone can join without needing special handshake Self administrating - No need to wait before beginning development - All program administration is already done. Seems to have been pretty well perfected by now. Cons: No real control - No real /need/ for control imho Not really under the musicpd.org umbrella - Is this /really/ a con? -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] What to do about mpc.
OK, so ,mpc disappeared from git.musicpd.org earlier and it appears no one wants to maintain it. Here's the last git tree I've gotten, should we put this back on git.musicpd.org and who is looking to maintain it? http://avuton.googlepages.com/mpc.tar.bz2 -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] MPD 0.14~beta1
Greetings, The MPD community is proud to announce the release MPD 0.14~beta1. The changes for this release (from alpha 3) include the usual stability fixes; support for non-unicode and non-latin1 file names; idle command subscriptions; stream seeking optimizations; if changed, state saves every 5 minutes; ffmpeg tag support and more. See the shortlog below or the full git changelog in the usual places. As usual thanks to all the developers from the community who made this release possible. Everyone please test and file bugs at our bug tracker: http://musicpd.org/mantis Thanks and enjoy! Avuton Olrich (1): MPD version 0.14~beta1 Konstantin Sobolev (3): path: fix g_convert() argument order mapper: use the utf8_to_fs_charset() result update: pass UTF-8 path to skip_symlink() Laszlo Ashin (6): aac: don't try to free static buffer aac: fix compiler warnings on amd64 wavpack: redo using audio_format_frame_size() aac: get rid of gcc warnings utils: introduce assert_static() wavpack: use assert_static() Marc Pavot (2): command: allow clients to subscribe to specific idle events command: added documentation for idle subscriptions Max Kellermann (31): decoder: check length==0 in decoder_read() aac: detect whether to pass uint32_t* to NeAACDecInit2() ffmpeg: fixed AVSEEK_SIZE input_stream: size==-1 means unknown size music_pipe: narrowed assertion on chunk index decoder: pass the correct buffer length to pcm_convert() doc: converted doc/COMMANDS to DocBook doc: fix Repeat typo in protocol.xml doc: process protocol.xml with xmlto input_curl: always set eof=true on CURLMSG_DONE curl: don't check running_handles for EOF input_curl: don't fail when seek to EOF is requested ogg: check the ov_read() return value before the vorbis_info evaluation ogg: moved the errorStr variable into the error handler decoder: ignore the SEEK command during startup input_curl: don't do temporary calculations with input_stream.offset input_curl: moved code to consume_buffer() input_curl: try to seek by fast-forwarding the buffer state_file: save state_file every 5 minutes log: print the log_domain aac: use GLib instead of utils.h/log.h audiofile: use GLib instead of log.h ffmpeg: use GLib instead of log.h flac, oggflac: use GLib instead of utils.h/log.h decoder: ignore decoder_data() calls with length==0 audio_format: added audio_format_valid() decoder: check audio_format_valid() in all decoders command: format strerror() with %s autogen.sh: removed libtoolize update: fixed shadow warning on basename Makefile.am: include protocol.xml in source tarball Monika Brinkert (3): doc: improved XML decorations doc: rephrase descriptions doc: merged protocol documentation from the wiki Viliam Mateicka (3): audiofile: fixed misplaced if ffmpeg: read tags from AVFormatContext AUTHORS: added Viliam Mateicka -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] [RFC-for-post-0.14] [PATCH] Support RVA2 Tags
Hello,
This is the first in a series of patches I hope to do to update from
patches in from our bug tracker. I hope as well to get comments, and
the community gives these concepts and patches the big ACK or NACK. I
will try to keep these patches up to date until they're either
accepted or given the NACK, at which time I'll pop it off my guilt and
close the bug. Most of these patches I have neutral feelings about
acceptance. I may attempt to provide new better versions with
criticism though, please keep in mind that I am not a developer.
This patch works for me with the test mp3 at the bug link below,
though I don't notice or know the difference with before or after.
For more information about this particular patch, please see:
http://musicpd.org/mantis/view.php?id=562
Feel free to pull it from my git tree:
Using a mpd-mk tree as a reference to minimize bandwidth:
git clone --reference mpd-mk/ git://repo.or.cz/mpd-mk/avuton.git
or just plain old:
git clone git://repo.or.cz/mpd-mk/avuton.git
From: Avuton Olrich [EMAIL PROTECTED]
Date: Sun, 23 Nov 2008 23:37:28 + (-0800)
Subject: Add RVA2 tag support to MPD
X-Git-Url:
http://repo.or.cz/w/mpd-mk/avuton.git?a=commitdiff_plain;h=ff66792aad6ba1ef888b0381577c93a27c8b76a7
Add RVA2 tag support to MPD
This patch adds RVA2 (relative volume adjustment) tag
support to mpd, as a fallback if no replaygain tags are
found. The code is almost directly from madplay (GPL).
RVA2 tags are generated for example by the normalize utility.
Originally by: Pauli Virtanen [EMAIL PROTECTED] Wed, 22 Feb 2006 23:13:25
+0200
Updated by: Avuton Olrich [EMAIL PROTECTED]
---
diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mp3_plugin.c
index 69cc7d0..ebf1669 100644
--- a/src/decoder/mp3_plugin.c
+++ b/src/decoder/mp3_plugin.c
@@ -204,6 +204,95 @@ mp3_fill_buffer(struct mp3_data *data)
}
#ifdef HAVE_ID3TAG
+/* Parse mp3 RVA2 frame. Shamelessly stolen from madplay. */
+static int parse_rva2(struct id3_tag * tag, struct replay_gain_info *
replay_gain_info)
+{
+ struct id3_frame const * frame;
+
+ id3_latin1_t const *id;
+ id3_byte_t const *data;
+ id3_length_t length;
+ int found;
+
+ enum {
+ CHANNEL_OTHER = 0x00,
+ CHANNEL_MASTER_VOLUME = 0x01,
+ CHANNEL_FRONT_RIGHT = 0x02,
+ CHANNEL_FRONT_LEFT= 0x03,
+ CHANNEL_BACK_RIGHT= 0x04,
+ CHANNEL_BACK_LEFT = 0x05,
+ CHANNEL_FRONT_CENTRE = 0x06,
+ CHANNEL_BACK_CENTRE = 0x07,
+ CHANNEL_SUBWOOFER = 0x08
+ };
+
+ found = 0;
+
+ /* relative volume adjustment information */
+
+ frame = id3_tag_findframe(tag, RVA2, 0);
+ if (!frame) return 0;
+
+ id = id3_field_getlatin1(id3_frame_field(frame, 0));
+ data = id3_field_getbinarydata(id3_frame_field(frame, 1),
+ length);
+
+ if (!id || !data) return 0;
+
+ /*
+* The 'identification' string is used to identify the
+* situation and/or device where this adjustment should apply.
+* The following is then repeated for every channel
+*
+* Type of channel $xx
+* Volume adjustment $xx xx
+* Bits representing peak $xx
+* Peak volume $xx (xx ...)
+*/
+
+ while (length = 4) {
+ unsigned int peak_bytes;
+
+ peak_bytes = (data[3] + 7) / 8;
+ if (4 + peak_bytes length)
+ break;
+
+ if (data[0] == CHANNEL_MASTER_VOLUME) {
+ signed int voladj_fixed;
+ double voladj_float;
+
+ /*
+* The volume adjustment is encoded as a fixed
+* point decibel value, 16 bit signed integer
+* representing (adjustment*512), giving +/- 64
+* dB with a precision of 0.001953125 dB.
+*/
+
+ voladj_fixed = (data[1] 8) | (data[2] 0);
+ voladj_fixed |= -(voladj_fixed 0x8000);
+
+ voladj_float = (double) voladj_fixed / 512;
+
+ replay_gain_info-tuples[REPLAY_GAIN_TRACK].peak =
voladj_float;
+ replay_gain_info-tuples[REPLAY_GAIN_ALBUM].peak =
voladj_float;
+
+ DEBUG(parseRVA2: Relative Volume
+ %+.1f dB adjustment (%s)\n,
+ voladj_float, id);
+
+ found = 1;
+ break;
+ }
+
+ data += 4 + peak_bytes;
+ length -= 4 + peak_bytes;
+ }
+
+ return found;
+}
+#endif
+
+#ifdef HAVE_ID3TAG
static struct replay_gain_info *
parse_id3_replay_gain_info(struct id3_tag *tag)
{
@@ -245,6 +334,11
Re: [Musicpd-dev-team] ANN: Rattlesnake 0.1.0
On Thu, Nov 13, 2008 at 11:52 PM, Max Kellermann [EMAIL PROTECTED] wrote: On 2008/11/13 22:58, [EMAIL PROTECTED] wrote: My apologies. Previous maintainers have cited solid, good, reasons for rejecting similar ideas, and to be honest, I could clearly see their points--I even agreed with them. That said, if you can entertain the idea, I'll put together some thoughts and we'll see what you think. Look for a follow-on email soon. I don't think this database is an important feature, and it should be optional at compile time, so users on small servers can simply disable it, without any overhead. My archetype is the Linux kernel: very featureful, bloated sometimes, but still runs on tiny systems when you disable the bloat features in the configuration. Then let's keep this somewhat simple, if we're going to go this route, let's do like you did with ncmpc and make a ./configure --enable-minimal for future options of this type. -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] sf.net / musicpd community
Hello, Along with my mantis cleaning, and mpd wiki improvements, I have gotten admin to the sf.net/projects/musicpd. Today, I have completely disabled access to the sf.net forums, I have added the complete backlog of many of our projects. All known packages of MPD, gmpc, libmpd, libmpdclient, gmpc-plugins, etc.. have been added. Mostly this was for historical reasons, but this is part of a larger vision. A disturbing problem has happened lately, and I know I can't take it all on myself. The problem is that notable projects pages have been disappearing with all of their sources and such. I would like to offer any MPD project a home for mirroring on our project, as we've recently lost a few good projects and their history. For example, pitchfork is now gone and while the latest sources are available, the rest may have been lost. And pitchfork is really just one of many I have noticed disappearing. May not seem like a big deal, but I guess it all depends on your priorities. Our sourceforge.net project was left due to the sorry shape of sourceforge. sf.net has improved by leaps and bounds since and going back into it today I checked the logs and it hasn't been touched since 2004. I have removed most people I haven't seen in years from the project. If you were removed in error please let me know and I'll restore your access asap. So, let me get to it. If you have a project you want added to sf.net/projects/musicpd I think we should have open invitation to it. Weather or not I hear from people I would like to begin inviting projects that don't have good external hosting (berlios, etc..) to mirror their project on sf.net/projects/musicpd mantis, unless of course there's objection. Please discuss! -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] musicpd.org web site needs to go.
On Fri, Oct 24, 2008 at 7:17 AM, Christ Schlacta [EMAIL PROTECTED] wrote: Problem I have with wiki is organization and ease of finding stuff. if you can make it easy to find common bits of information from the front page (config keys, common setups, install and config guides, supported formats, downloads, what the hell is this, etc.) right from the first page you see, I'm all for it. The real fault with this argument is even if this information is on the website, it's outdated and irrelevant, and otherwise doesn't exist. This is the old case of patches are welcome, but to the tenth power, as literally anyone who understands the English language is capable of fixing up the wiki. -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
Re: [Musicpd-dev-team] 10 question + 1 patch
On Thu, Oct 9, 2008 at 1:52 AM, Qball Cow [EMAIL PROTECTED] wrote: 6th. What are we going to do with the mpd website? When are people going to listen to me and blow that shit sky-high. It's completely unnecessary, no one wants to put time into it and even if they did it wouldn't get maintained unlike the wiki. Time to redirect to the wiki and modify it to be more user friendly, if that's what's necessary. -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
[Musicpd-dev-team] mpd-mk bug due to excessive list commands?
Recent mpd-mks have caused gmpc to crash (I'm not sure when it started). It will go to ruins after timing out on 'list title' When gmpc starts it can look like this: client 0: opened from 10.0.0.5 client 0: process command commands client 0: command returned 0 client 0: process command notcommands client 0: command returned 0 client 0: process command status client 0: command returned 0 client 0: process command outputs client 0: command returned 0 client 0: process command outputs client 0: command returned 0 client 0: process command outputs client 0: command returned 0 client 0: process command list genre client 0: command returned 0 client 0: process command list genre client 0: command returned 0 client 0: process command list artist client 0: buffer created client 0: command returned 0 client 0: buffer empty 0 client 0: process command list album client 0: command returned 0 client 0: process command list disc client 0: command returned 0 client 0: process command list artist client 0: command returned 0 client 0: process command list album client 0: buffer created client 0: command returned 0 client 0: buffer empty 0 client 0: process command list disc client 0: command returned 0 client 0: process command list artist client 0: command returned 0 client 0: process command list artist client 0: command returned 0 client 0: process command list album client 0: command returned 0 client 0: process command list title client 0: problems writing client 0: command returned 0 client 0: closed What happened was mpd-mk was exposing a bug in gmpc (yay!) but it appears to have exposed a problem in mpd-mk as well. This is repeatable and always happens by the time it gets to 'list title'. This does not occur if user telnets in and types the command 'list title' though. Next step? -- avuton -- I've got a fever. And the only prescription is more cowbell. -- Christopher Walken - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
