[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Ccaudio-devel] Patch to build against latest ucommon
From: |
David Sugar |
Subject: |
Re: [Ccaudio-devel] Patch to build against latest ucommon |
Date: |
Fri, 4 Oct 2013 14:15:59 -0400 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
I do not believe any attribute should be specified. Should just be
dir.open(path). But otherwise, yes...
In fact, I am preparing a 2.1 release now, using this, and also modernizing
the configure.ac...
Brandon Invergo wrote:
> Hi,
>
> ccAudio 2.05 fails to build against the latest uCommon versions. I've
> attached a patch that at least fixes the build in the GNU Source Release
> Collection (GSRC). Please double-check that I had the right ideas
> (i.e. in friends.cpp, Audio::init, opening the directory as a DEVICE).
>
> Cheers,
> Brandon
>
> diff -x config.log -x config.status -ru work/ccaudio2-2.0.5/src/friends.cpp
> work/ccaudio2-2.0.5/src/friends.cpp
> --- work/ccaudio2-2.0.5/src/friends.cpp 2011-03-21 08:16:40.000000000
> +0100
> +++ work/ccaudio2-2.0.5/src/friends.cpp 2013-10-04 13:36:06.926539405
> +0200
> @@ -1186,16 +1186,16 @@
> if(!dp)
> return;
>
> - fsys::open(dir, dp, fsys::ACCESS_DIRECTORY);
> + dir.open(dp, fsys::DEVICE);
>
> - while(is(dir) && fsys::read(dir, filename, sizeof(filename)) > 0) {
> + while(is(dir) && dir.read(filename, sizeof(filename)) > 0) {
> if(filename[0] == '.')
> continue;
>
> snprintf(path, sizeof(path), "%s/%s", dp, filename);
> - fsys::load(path);
> + dir.load(path);
> }
> - fsys::close(dir);
> + dir.close();
> #endif
> }
>
> diff -x config.log -x config.status -ru
> work/ccaudio2-2.0.5/utils/audiotool.cpp
> work/ccaudio2-2.0.5/utils/audiotool.cpp
> --- work/ccaudio2-2.0.5/utils/audiotool.cpp 2011-03-21 08:16:40.000000000
> +0100
> +++ work/ccaudio2-2.0.5/utils/audiotool.cpp 2013-10-04 13:50:13.662811477
> +0200
> @@ -401,12 +401,12 @@
> framing = 20;
>
> while(*argv) {
> - if(!fsys::isfile(*argv)) {
> + if(!fsys::is_file(*argv)) {
> printf("%s: %s\n",
> fname(*(argv++)), _TEXT("invalid"));
> continue;
> }
> - if(fsys::access(*argv, R_OK)) {
> + if(!fsys::is_readable(*argv)) {
> printf("%s: %s\n",
> fname(*(argv++)), _TEXT("inaccessable"));
> continue;
> @@ -530,12 +530,12 @@
> }
>
> while(*argv) {
> - if(!fsys::isfile(*argv)) {
> + if(!fsys::is_file(*argv)) {
> printf("audiotool: %s: %s\n",
> fname(*(argv++)), _TEXT("invalid"));
> continue;
> }
> - if(fsys::access(*argv, R_OK)) {
> + if(fsys::is_readable(*argv)) {
> printf("audiotool: %s: %s\n",
> fname(*(argv++)), _TEXT("inaccessable"));
> continue;
> @@ -682,12 +682,12 @@
> framing = 20;
>
> while(*argv) {
> - if(!fsys::isfile(*argv)) {
> + if(!fsys::is_file(*argv)) {
> printf("%s: %s\n",
> *(argv++), _TEXT("invalid"));
> continue;
> }
> - if(fsys::access(*argv, R_OK)) {
> + if(fsys::is_readable(*argv)) {
> printf("%s: %s\n",
> *(argv++), _TEXT("inaccessable"));
> continue;
> @@ -881,12 +881,12 @@
> framing = 20;
>
> while(*argv) {
> - if(!fsys::isfile(*argv)) {
> + if(!fsys::is_file(*argv)) {
> printf("%s: %s\n",
> *(argv++), _TEXT("invalid"));
> continue;
> }
> - if(fsys::access(*argv, R_OK)) {
> + if(fsys::is_readable(*argv)) {
> printf("%s: %s\n",
> *(argv++), _TEXT("inaccessable"));
> continue;
>
>
>
> --
> Brandon Invergo
> http://brandon.invergo.net
> _______________________________________________
> Ccaudio-devel mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/ccaudio-devel
pgpnPw9Hmv2hL.pgp
Description: PGP signature