X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fsamples.C;h=e22d28e5b8372fe67175da5f793dcb4f073b4931;hb=eecf057a9d6b8c8cffc7d0001bff89bc9cac7b05;hp=4e30c6ba3e2368d9d0e1e8b521f4f50bd5413d19;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/samples.C b/cinelerra-5.1/cinelerra/samples.C index 4e30c6ba..e22d28e5 100644 --- a/cinelerra-5.1/cinelerra/samples.C +++ b/cinelerra-5.1/cinelerra/samples.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2009 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 - * + * */ @@ -98,24 +98,24 @@ void Samples::share(int shmid) void Samples::allocate(int samples, int use_shm) { - if(data && - this->allocated >= samples && + if(data && + this->allocated >= samples && this->use_shm == use_shm) return; - if(data) + if(data) { if(this->use_shm) shmdt(data); else delete [] data; } - + this->use_shm = use_shm; if(use_shm) { - shmid = shmget(IPC_PRIVATE, - (samples + 1) * sizeof(double), + shmid = shmget(IPC_PRIVATE, + (samples + 1) * sizeof(double), IPC_CREAT | 0777); data = (double*)shmat(shmid, NULL, 0); // This causes it to automatically delete when the program exits. @@ -126,13 +126,13 @@ void Samples::allocate(int samples, int use_shm) shmid = -1; data = new double[samples]; } - - + + this->allocated = samples; - + } // Get the buffer