Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/rezound/0.12.3_beta: 060_all_raw_save.patch series
Date: Sun, 30 Dec 2007 12:31:21
Message-Id: E1J8xK0-0002z5-Lx@stork.gentoo.org
1 aballier 07/12/30 12:31:16
2
3 Modified: series
4 Added: 060_all_raw_save.patch
5 Log:
6 add a patch from Christian Schoenebeck <cuse@×××××××××××××××××.net>, bug #203471, to save raw files correctly
7
8 Revision Changes Path
9 1.3 src/patchsets/rezound/0.12.3_beta/series
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/rezound/0.12.3_beta/series?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/rezound/0.12.3_beta/series?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/rezound/0.12.3_beta/series?r1=1.2&r2=1.3
14
15 Index: series
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/rezound/0.12.3_beta/series,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- series 30 Mar 2007 22:27:19 -0000 1.2
22 +++ series 30 Dec 2007 12:31:16 -0000 1.3
23 @@ -3,3 +3,4 @@
24 030_all_dont-ignore-cxxflags.patch
25 040_all_automagic.patch
26 050_all_portaudio19.patch
27 +060_all_raw_save.patch
28
29
30
31 1.1 src/patchsets/rezound/0.12.3_beta/060_all_raw_save.patch
32
33 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/rezound/0.12.3_beta/060_all_raw_save.patch?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/rezound/0.12.3_beta/060_all_raw_save.patch?rev=1.1&content-type=text/plain
35
36 Index: 060_all_raw_save.patch
37 ===================================================================
38 https://bugs.gentoo.org/show_bug.cgi?id=203471
39 rezound-0.12.3_beta simply ingores the parameters of the edited sound when
40 saving it as RAW file.
41 Patch by Christian Schoenebeck <cuse@×××××××××××××××××.net>
42
43 diff --recursive -U 3 rezound-0.12.3beta.orig/src/backend/CrawSoundTranslator.cpp rezound-0.12.3beta/src/backend/CrawSoundTranslator.cpp
44 --- rezound-0.12.3beta.orig/src/backend/CrawSoundTranslator.cpp 2005-02-15 03:28:38.000000000 +0000
45 +++ rezound-0.12.3beta/src/backend/CrawSoundTranslator.cpp 2007-12-27 16:12:44.000000000 +0000
46 @@ -132,6 +132,13 @@
47 // get user preferences for saving the raw data
48 static bool parametersGotten=false;
49 static AFrontendHooks::RawParameters parameters;
50 +
51 + // init parameters which cannot be changed by the RAW parameters dialog
52 + parameters.channelCount=sound->getChannelCount();
53 + parameters.sampleRate=sound->getSampleRate();
54 + parameters.dataLength=sound->getLength();
55 + parameters.dataOffset=0;
56 +
57 useLastUserPrefs&=parametersGotten;
58 if(!useLastUserPrefs)
59 {
60 diff --recursive -U 3 rezound-0.12.3beta.orig/src/frontend_fox/CRawDialog.cpp rezound-0.12.3beta/src/frontend_fox/CRawDialog.cpp
61 --- rezound-0.12.3beta.orig/src/frontend_fox/CRawDialog.cpp 2005-05-01 04:57:36.000000000 +0000
62 +++ rezound-0.12.3beta/src/frontend_fox/CRawDialog.cpp 2007-12-27 15:29:47.000000000 +0000
63 @@ -137,8 +137,11 @@
64
65 if(execute(PLACEMENT_SCREEN))
66 {
67 - parameters.channelCount=atoi(channelsCountComboBox->getText().text());
68 - parameters.sampleRate=atoi(sampleRateComboBox->getText().text());
69 + // don't apply values of hidden GUI controls
70 + if (showLoadRawParameters) {
71 + parameters.channelCount=atoi(channelsCountComboBox->getText().text());
72 + parameters.sampleRate=atoi(sampleRateComboBox->getText().text());
73 + }
74
75 switch(sampleFormatComboBox->getCurrentItem())
76 {
77 @@ -158,19 +161,22 @@
78
79 parameters.endian= byteOrderToggleButton->getState() ? AFrontendHooks::RawParameters::eBigEndian : AFrontendHooks::RawParameters::eLittleEndian;
80
81 - if(atoi(dataOffsetTextBox->getText().text())<0)
82 - {
83 - Error(_("invalid negative data offset"));
84 - return(false);
85 - }
86 - parameters.dataOffset=atoi(dataOffsetTextBox->getText().text());
87 -
88 - if(atoi(dataLengthTextBox->getText().text())<0)
89 - {
90 - Error(_("invalid negative data length"));
91 - return(false);
92 + // don't apply values of hidden GUI controls
93 + if (showLoadRawParameters) {
94 + if(atoi(dataOffsetTextBox->getText().text())<0)
95 + {
96 + Error(_("invalid negative data offset"));
97 + return(false);
98 + }
99 + parameters.dataOffset=atoi(dataOffsetTextBox->getText().text());
100 +
101 + if(atoi(dataLengthTextBox->getText().text())<0)
102 + {
103 + Error(_("invalid negative data length"));
104 + return(false);
105 + }
106 + parameters.dataLength=atoi(dataLengthTextBox->getText().text());
107 }
108 - parameters.dataLength=atoi(dataLengthTextBox->getText().text());
109
110 return(true);
111 }
112 diff --recursive -U 3 rezound-0.12.3beta.orig/src/frontend_fox/CRawDialog.h rezound-0.12.3beta/src/frontend_fox/CRawDialog.h
113 --- rezound-0.12.3beta.orig/src/frontend_fox/CRawDialog.h 2005-02-15 06:23:34.000000000 +0000
114 +++ rezound-0.12.3beta/src/frontend_fox/CRawDialog.h 2007-12-27 15:03:27.000000000 +0000
115 @@ -37,7 +37,7 @@
116 CRawDialog(FXWindow *mainWindow);
117 virtual ~CRawDialog();
118
119 - bool show(AFrontendHooks::RawParameters &parameters,bool showOffsetAndLengthParameters);
120 + bool show(AFrontendHooks::RawParameters &parameters,bool showLoadRawParameters);
121
122 //long onRadioButton(FXObject *sender,FXSelector sel,void *ptr);
123
124
125
126
127 --
128 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups