From cinelerra-commits-admin@skolelinux.no Sat Feb 2 15:42:16 2008 Return-Path: X-Original-To: cinelerra-commits@e.kevb.net Delivered-To: cinelerra-commits@e.kevb.net Received: from init.linpro.no (init.linpro.no [80.232.38.252]) by e.kevb.net (Postfix) with ESMTP id B89691040010 for ; Sat, 2 Feb 2008 15:42:15 -0500 (EST) Received: from localhost ([127.0.0.1] helo=init.linpro.no) by init.linpro.no with esmtp (Exim 4.50 #1 (Debian)) id 1JLPBh-0005p5-TC; Sat, 02 Feb 2008 21:42:10 +0100 Received: from [193.69.32.11] (helo=virusvask01.itsjefen.no) by init.linpro.no with esmtp (Exim 4.50 #1 (Debian)) id 1JLOcp-00030O-6O for ; Sat, 02 Feb 2008 21:06:10 +0100 Received: from [193.69.32.11] by 80.232.38.252 (e-nough); Sat, 2 Feb 21:05:59 2008 +0100 Received: from localhost (localhost.localdomain [127.0.0.1]) by virusvask01.itsjefen.no (Postfix) with ESMTP id A28558AC012 for ; Sat, 2 Feb 2008 21:06:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at virusvask01.itsjefen.no Received: from virusvask01.itsjefen.no ([127.0.0.1]) by localhost (virusvask01.itsjefen.no [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id grG3Bv0WVzbs for ; Sat, 2 Feb 2008 21:05:58 +0100 (CET) Received: from mail-forward.uio.no (mail-forward.uio.no [129.240.10.42]) by virusvask01.itsjefen.no (Postfix) with ESMTP id 787B18AC005 for ; Sat, 2 Feb 2008 21:05:58 +0100 (CET) Received: from mail-mx5.uio.no ([129.240.10.46]) by pat.uio.no with esmtp (Exim 4.67) (envelope-from ) id 1JLOcg-0001l8-CJ for cinelerra-commits@skolelinux.no; Sat, 02 Feb 2008 21:05:58 +0100 Received: from user.skolelinux.no ([158.36.191.139]) by mail-mx5.uio.no with esmtps (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1JLOcg-0007Cg-1B for cinelerra-commits@skolelinux.no; Sat, 02 Feb 2008 21:05:58 +0100 Received: from raffa by user.skolelinux.no with local (Exim 4.63) (envelope-from ) id 1JLOcf-0006xU-R1 for cinelerra-commits@skolelinux.no; Sat, 02 Feb 2008 21:05:57 +0100 To: cinelerra-commits@skolelinux.no Content-Type: text/plain; charset=UTF-8 From: "Raffaella Traniello " Message-Id: X-UiO-ClamAV-Virus: No X-UiO-Spam-info: not spam, SpamAssassin (score=0.0, required=5.0, autolearn=disabled, none) X-UiO-Scanned: 56C571CFCD618F1437D4F144650F2E1864488AF6 X-UiO-SPAM-Test: remote_host: 158.36.191.139 spam_score: 0 maxlevel 200 minaction 2 bait 0 mail/h: 2 total 19514 max/h 1171 blacklist 0 greylist 0 ratelimit 0 Content-Transfer-Encoding: quoted-printable X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on spamtrap X-Spam-Status: No, hits=0.0 required=5.0 tests=DSPAM=0 version=2.63 X-Spam-Level: X-DSPAM-Signature: !DSPAM:47a4cd2a56981133039621! X-DSPAM-Probability: 0.0000 X-DSPAM-Confidence: 0.9997 X-Spam-Score: 0.0 (/) Subject: [Cinelerra-commits] r1050 - trunk/hvirtual/cinelerra Sender: cinelerra-commits-admin@skolelinux.no Errors-To: cinelerra-commits-admin@skolelinux.no X-BeenThere: cinelerra-commits@skolelinux.no X-Mailman-Version: 2.0.13 Precedence: bulk List-Unsubscribe: , List-Id: Commits to the Cinelerra CVS. List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sat, 02 Feb 2008 21:05:57 +0100 X-Spam-Score: 0.0 (/) Author: raffa Date: 2008-02-02 21:05:57 +0100 (Sat, 02 Feb 2008) New Revision: 1050 Modified: trunk/hvirtual/cinelerra/formatpopup.C Log: Reverted changes made in r1049, untested small changes didn't work Modified: trunk/hvirtual/cinelerra/formatpopup.C =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hvirtual/cinelerra/formatpopup.C 2008-02-02 16:13:55 UTC (rev 1= 049) +++ trunk/hvirtual/cinelerra/formatpopup.C 2008-02-02 20:05:57 UTC (rev 1= 050) @@ -1,4 +1,4 @@ -=EF=BB=BF#include "bcsignals.h" +#include "bcsignals.h" #include "file.inc" #include "formatpopup.h" #include "language.h" @@ -11,7 +11,7 @@ int y, int use_brender) : BC_ListBox(x,=20 - y,=20 + y,=20 200,=20 200, LISTBOX_TEXT, @@ -33,8 +33,7 @@ { format_items.append(new BC_ListBoxItem(_(AC3_NAME))); format_items.append(new BC_ListBoxItem(_(AIFF_NAME))); - format_items.append(new BC_ListBoxItem(_(EXR_NAME))); - format_items.append(new BC_ListBoxItem(_(EXR_LIST_NAME))); + format_items.append(new BC_ListBoxItem(_(AU_NAME))); format_items.append(new BC_ListBoxItem(_(JPEG_NAME))); } =20 @@ -43,11 +42,17 @@ if(!use_brender) { format_items.append(new BC_ListBoxItem(_(AVI_NAME))); + format_items.append(new BC_ListBoxItem(_(EXR_NAME))); + format_items.append(new BC_ListBoxItem(_(EXR_LIST_NAME))); + format_items.append(new BC_ListBoxItem(_(YUV_NAME))); format_items.append(new BC_ListBoxItem(_(WAV_NAME))); + format_items.append(new BC_ListBoxItem(_(MOV_NAME))); + format_items.append(new BC_ListBoxItem(_(RAWDV_NAME))); format_items.append(new BC_ListBoxItem(_(AMPEG_NAME))); format_items.append(new BC_ListBoxItem(_(VMPEG_NAME))); - format_items.append(new BC_ListBoxItem(_(OGG_NAME))); format_items.append(new BC_ListBoxItem(_(VORBIS_NAME))); + format_items.append(new BC_ListBoxItem(_(OGG_NAME))); + format_items.append(new BC_ListBoxItem(_(PCM_NAME))); format_items.append(new BC_ListBoxItem(_(PNG_NAME))); } =20 @@ -55,10 +60,6 @@ =20 if(!use_brender) { - format_items.append(new BC_ListBoxItem(_(MOV_NAME))); - format_items.append(new BC_ListBoxItem(_(RAWDV_NAME))); - format_items.append(new BC_ListBoxItem(_(PCM_NAME))); - format_items.append(new BC_ListBoxItem(_(AU_NAME)));=20 format_items.append(new BC_ListBoxItem(_(TGA_NAME))); } =20 @@ -70,11 +71,6 @@ } =20 format_items.append(new BC_ListBoxItem(_(TIFF_LIST_NAME))); - - if(!use_brender) - { - format_items.append(new BC_ListBoxItem(_(YUV_NAME))); - } update(&format_items, 0, 0, @@ -89,4 +85,4 @@ =20 int FormatPopup::handle_event() { -} \ No newline at end of file +} _______________________________________________ Cinelerra-commits mailing list Cinelerra-commits@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra-commits