lbajardsilogic@0
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
lbajardsilogic@0
|
2
|
lbajardsilogic@0
|
3 /*
|
lbajardsilogic@0
|
4 Sonic Visualiser
|
lbajardsilogic@0
|
5 An audio file viewer and annotation editor.
|
lbajardsilogic@0
|
6 Centre for Digital Music, Queen Mary, University of London.
|
lbajardsilogic@0
|
7 This file copyright 2006 Chris Cannam and QMUL.
|
lbajardsilogic@0
|
8
|
lbajardsilogic@0
|
9 This program is free software; you can redistribute it and/or
|
lbajardsilogic@0
|
10 modify it under the terms of the GNU General Public License as
|
lbajardsilogic@0
|
11 published by the Free Software Foundation; either version 2 of the
|
lbajardsilogic@0
|
12 License, or (at your option) any later version. See the file
|
lbajardsilogic@0
|
13 COPYING included with this distribution for more information.
|
lbajardsilogic@0
|
14 */
|
lbajardsilogic@0
|
15
|
lbajardsilogic@0
|
16 #include "MainWindow.h"
|
lbajardsilogic@0
|
17
|
lbajardsilogic@0
|
18 #include "system/System.h"
|
lbajardsilogic@0
|
19 #include "system/Init.h"
|
lbajardsilogic@0
|
20 #include "base/TempDirectory.h"
|
lbajardsilogic@0
|
21 #include "base/PropertyContainer.h"
|
lbajardsilogic@0
|
22 #include "base/Preferences.h"
|
lbajardsilogic@0
|
23 #include "widgets/TipDialog.h"
|
benoitrigolleau@58
|
24 #include "widgets/EasaierStyle.h"
|
lbajardsilogic@0
|
25
|
lbajardsilogic@0
|
26 #include <QMetaType>
|
lbajardsilogic@0
|
27 #include <QApplication>
|
lbajardsilogic@0
|
28 #include <QDesktopWidget>
|
lbajardsilogic@0
|
29 #include <QMessageBox>
|
lbajardsilogic@0
|
30 #include <QTranslator>
|
lbajardsilogic@0
|
31 #include <QLocale>
|
lbajardsilogic@0
|
32 #include <QSettings>
|
lbajardsilogic@0
|
33 #include <QIcon>
|
lbajardsilogic@0
|
34 #include <QSessionManager>
|
lbajardsilogic@2
|
35 #include <QPlastiqueStyle>
|
benoitrigolleau@58
|
36 #include <QSplashScreen>
|
lbajardsilogic@0
|
37
|
lbajardsilogic@0
|
38 #include <iostream>
|
lbajardsilogic@0
|
39 #include <signal.h>
|
lbajardsilogic@0
|
40
|
lbajardsilogic@0
|
41 /*! \mainpage Sonic Visualiser
|
lbajardsilogic@0
|
42
|
lbajardsilogic@0
|
43 \section interesting Summary of interesting classes
|
lbajardsilogic@0
|
44
|
lbajardsilogic@0
|
45 - Data models: Model and subclasses, e.g. WaveFileModel
|
lbajardsilogic@0
|
46
|
lbajardsilogic@0
|
47 - Graphical layers: Layer and subclasses, displayed on View and its
|
lbajardsilogic@0
|
48 subclass widgets.
|
lbajardsilogic@0
|
49
|
lbajardsilogic@0
|
50 - Main window class, document class, and file parser: MainWindow,
|
lbajardsilogic@0
|
51 Document, SVFileReader
|
lbajardsilogic@0
|
52
|
lbajardsilogic@0
|
53 - Turning one model (e.g. audio) into another (e.g. more audio, or a
|
lbajardsilogic@0
|
54 curve extracted from it): Transform and subclasses
|
lbajardsilogic@0
|
55
|
lbajardsilogic@0
|
56 - Creating the plugins used by transforms: RealTimePluginFactory,
|
lbajardsilogic@0
|
57 FeatureExtractionPluginFactory. See also the API documentation for
|
lbajardsilogic@0
|
58 Vamp feature extraction plugins at
|
lbajardsilogic@0
|
59 http://www.vamp-plugins.org/code-doc/.
|
lbajardsilogic@0
|
60
|
lbajardsilogic@0
|
61 - File reading and writing code: AudioFileReader and subclasses,
|
lbajardsilogic@0
|
62 WavFileWriter, DataFileReader, SVFileReader
|
lbajardsilogic@0
|
63
|
lbajardsilogic@0
|
64 - FFT calculation and cacheing: FFTModel, FFTDataServer
|
lbajardsilogic@0
|
65
|
lbajardsilogic@0
|
66 - Widgets that show groups of editable properties: PropertyBox for
|
lbajardsilogic@0
|
67 layer properties (contained in a PropertyStack), PluginParameterBox
|
lbajardsilogic@0
|
68 for plugins (contained in a PluginParameterDialog)
|
lbajardsilogic@0
|
69
|
lbajardsilogic@0
|
70 - Audio playback: AudioCallbackPlaySource and subclasses,
|
lbajardsilogic@0
|
71 AudioCallbackPlayTarget and subclasses, AudioGenerator
|
lbajardsilogic@0
|
72
|
lbajardsilogic@0
|
73 \section model Data sources: the Model hierarchy
|
lbajardsilogic@0
|
74
|
lbajardsilogic@0
|
75 A Model is something containing, or knowing how to obtain, data.
|
lbajardsilogic@0
|
76
|
lbajardsilogic@0
|
77 For example, WaveFileModel is a model that knows how to get data
|
lbajardsilogic@0
|
78 from an audio file; SparseTimeValueModel is a model containing
|
lbajardsilogic@0
|
79 editable "curve" data.
|
lbajardsilogic@0
|
80
|
lbajardsilogic@0
|
81 Models typically subclass one of a number of abstract subclasses of
|
lbajardsilogic@0
|
82 Model. For example, WaveFileModel subclasses DenseTimeValueModel,
|
lbajardsilogic@0
|
83 which describes an interface for models that have a value at each
|
lbajardsilogic@0
|
84 time point for a given sampling resolution. (Note that
|
lbajardsilogic@0
|
85 WaveFileModel does not actually read the files itself: it uses
|
lbajardsilogic@0
|
86 AudioFileReader classes for that. It just makes data from the
|
lbajardsilogic@0
|
87 files available in a Model.) SparseTimeValueModel uses the
|
lbajardsilogic@0
|
88 SparseModel template class, which provides most of the
|
lbajardsilogic@0
|
89 implementation for models that contain a series of points of some
|
lbajardsilogic@0
|
90 sort -- also used by NoteModel, TextModel, and
|
lbajardsilogic@0
|
91 SparseOneDimensionalModel.
|
lbajardsilogic@0
|
92
|
lbajardsilogic@0
|
93 Everything that goes on the screen originates from a model, via a
|
lbajardsilogic@0
|
94 layer (see below). The models are contained in a Document object.
|
lbajardsilogic@0
|
95 There is no containment hierarchy or ordering of models in the
|
lbajardsilogic@0
|
96 document. One model is the main model, which defines the sample
|
lbajardsilogic@0
|
97 rate for playback.
|
lbajardsilogic@0
|
98
|
lbajardsilogic@0
|
99 A model may also be marked as a "derived" model, which means it was
|
lbajardsilogic@0
|
100 generated from another model using some transform (feature
|
lbajardsilogic@0
|
101 extraction or effect plugin, etc) -- the idea being that they can
|
lbajardsilogic@0
|
102 be re-generated using the same transform if a new source model is
|
lbajardsilogic@0
|
103 loaded.
|
lbajardsilogic@0
|
104
|
lbajardsilogic@0
|
105 \section layer Things that can display data: the Layer hierarchy
|
lbajardsilogic@0
|
106
|
lbajardsilogic@0
|
107 A Layer is something that knows how to draw parts of a model onto a
|
lbajardsilogic@0
|
108 timeline.
|
lbajardsilogic@0
|
109
|
lbajardsilogic@0
|
110 For example, WaveformLayer is a layer which draws waveforms, based
|
lbajardsilogic@0
|
111 on WaveFileModel; TimeValueLayer draws curves, based on
|
lbajardsilogic@0
|
112 SparseTimeValueModel; SpectrogramLayer draws spectrograms, based on
|
lbajardsilogic@0
|
113 WaveFileModel (via FFTModel).
|
lbajardsilogic@0
|
114
|
lbajardsilogic@0
|
115 The most basic functions of a layer are: to draw itself onto a
|
lbajardsilogic@0
|
116 Pane, against a timeline on the x axis; and to permit user
|
lbajardsilogic@0
|
117 interaction. If you were thinking of adding the capability to
|
lbajardsilogic@0
|
118 display a new sort of something, then you would want to add a new
|
lbajardsilogic@0
|
119 layer type. (You may also need a new model type, depending on
|
lbajardsilogic@0
|
120 whether any existing model can capture the data you need.)
|
lbajardsilogic@0
|
121 Depending on the sort of data in question, there are various
|
lbajardsilogic@0
|
122 existing layers that might be appropriate to start from -- for
|
lbajardsilogic@0
|
123 example, a layer that displays images that the user has imported
|
lbajardsilogic@0
|
124 and associated with particular times might have something in common
|
lbajardsilogic@0
|
125 with the existing TextLayer which displays pieces of text that are
|
lbajardsilogic@0
|
126 associated with particular times.
|
lbajardsilogic@0
|
127
|
lbajardsilogic@0
|
128 Although layers are visual objects, they are contained in the
|
lbajardsilogic@0
|
129 Document in Sonic Visualiser rather than being managed together
|
lbajardsilogic@0
|
130 with display widgets. The Sonic Visualiser file format has
|
lbajardsilogic@0
|
131 separate data and layout sections, and the layers are defined in
|
lbajardsilogic@0
|
132 the data section and then referred to in the layout section which
|
lbajardsilogic@0
|
133 determines which layers may go on which panes (see Pane below).
|
lbajardsilogic@0
|
134
|
lbajardsilogic@0
|
135 Once a layer class is defined, some basic data about it needs to be
|
lbajardsilogic@0
|
136 set up in the LayerFactory class, and then it will appear in the
|
lbajardsilogic@0
|
137 menus and so on on the main window.
|
lbajardsilogic@0
|
138
|
lbajardsilogic@0
|
139 \section view Widgets that are used to show layers: The View hierarchy
|
lbajardsilogic@0
|
140
|
lbajardsilogic@0
|
141 A View is a widget that displays a stack of layers. The most
|
lbajardsilogic@0
|
142 important subclass is Pane, the widget that is used to show most of
|
lbajardsilogic@0
|
143 the data in the main window of Sonic Visualiser.
|
lbajardsilogic@0
|
144
|
lbajardsilogic@0
|
145 All a pane really does is contain a set of layers and get them to
|
lbajardsilogic@0
|
146 render themselves (one on top of the other, with the topmost layer
|
lbajardsilogic@0
|
147 being the one that is currently interacted with), cache the
|
lbajardsilogic@0
|
148 results, negotiate user interaction with them, and so on. This is
|
lbajardsilogic@0
|
149 generally fiddly, if not especially interesting. Panes are
|
lbajardsilogic@0
|
150 strictly layout objects and are not stored in the Document class;
|
lbajardsilogic@0
|
151 instead the MainWindow contains a PaneStack widget (the widget that
|
lbajardsilogic@0
|
152 takes up most of Sonic Visualiser's main window) which contains a
|
lbajardsilogic@0
|
153 set of panes stacked vertically.
|
lbajardsilogic@0
|
154
|
lbajardsilogic@0
|
155 Another View subclass is Overview, which is the widget that
|
lbajardsilogic@0
|
156 contains that green waveform showing the entire file at the bottom
|
lbajardsilogic@0
|
157 of the window.
|
lbajardsilogic@0
|
158
|
lbajardsilogic@0
|
159 */
|
lbajardsilogic@0
|
160
|
lbajardsilogic@0
|
161 static QMutex cleanupMutex;
|
lbajardsilogic@0
|
162
|
lbajardsilogic@0
|
163 static void
|
lbajardsilogic@0
|
164 signalHandler(int /* signal */)
|
lbajardsilogic@0
|
165 {
|
lbajardsilogic@0
|
166 // Avoid this happening more than once across threads
|
lbajardsilogic@0
|
167
|
lbajardsilogic@0
|
168 cleanupMutex.lock();
|
lbajardsilogic@0
|
169 std::cerr << "signalHandler: cleaning up and exiting" << std::endl;
|
lbajardsilogic@0
|
170 TempDirectory::getInstance()->cleanup();
|
lbajardsilogic@0
|
171 exit(0); // without releasing mutex
|
lbajardsilogic@0
|
172 }
|
lbajardsilogic@0
|
173
|
lbajardsilogic@0
|
174 class SVApplication : public QApplication
|
lbajardsilogic@0
|
175 {
|
lbajardsilogic@0
|
176 public:
|
lbajardsilogic@0
|
177 SVApplication(int argc, char **argv) :
|
lbajardsilogic@0
|
178 QApplication(argc, argv),
|
lbajardsilogic@0
|
179 m_mainWindow(0) { }
|
lbajardsilogic@0
|
180 virtual ~SVApplication() { }
|
lbajardsilogic@0
|
181
|
lbajardsilogic@0
|
182 void setMainWindow(MainWindow *mw) { m_mainWindow = mw; }
|
lbajardsilogic@0
|
183 void releaseMainWindow() { m_mainWindow = 0; }
|
lbajardsilogic@0
|
184
|
lbajardsilogic@0
|
185 virtual void commitData(QSessionManager &manager) {
|
lbajardsilogic@0
|
186 if (!m_mainWindow) return;
|
lbajardsilogic@0
|
187 bool mayAskUser = manager.allowsInteraction();
|
lbajardsilogic@0
|
188 bool success = m_mainWindow->commitData(mayAskUser);
|
lbajardsilogic@0
|
189 manager.release();
|
lbajardsilogic@0
|
190 if (!success) manager.cancel();
|
lbajardsilogic@0
|
191 }
|
lbajardsilogic@0
|
192
|
lbajardsilogic@0
|
193 protected:
|
lbajardsilogic@0
|
194 MainWindow *m_mainWindow;
|
lbajardsilogic@0
|
195 };
|
lbajardsilogic@0
|
196
|
lbajardsilogic@0
|
197 int
|
lbajardsilogic@0
|
198 main(int argc, char **argv)
|
lbajardsilogic@0
|
199 {
|
benoitrigolleau@58
|
200
|
lbajardsilogic@0
|
201 SVApplication application(argc, argv);
|
lbajardsilogic@2
|
202
|
benoitrigolleau@58
|
203 QSplashScreen *splash = new QSplashScreen;
|
benoitrigolleau@58
|
204 splash->setPixmap(QPixmap(":icons/splashscreen.png"));
|
benoitrigolleau@58
|
205 splash->show();
|
benoitrigolleau@58
|
206
|
lbajardsilogic@0
|
207 QStringList args = application.arguments();
|
lbajardsilogic@0
|
208
|
lbajardsilogic@0
|
209 signal(SIGINT, signalHandler);
|
lbajardsilogic@0
|
210 signal(SIGTERM, signalHandler);
|
lbajardsilogic@0
|
211
|
lbajardsilogic@0
|
212 #ifndef Q_WS_WIN32
|
lbajardsilogic@0
|
213 signal(SIGHUP, signalHandler);
|
lbajardsilogic@0
|
214 signal(SIGQUIT, signalHandler);
|
lbajardsilogic@0
|
215 #endif
|
lbajardsilogic@0
|
216
|
lbajardsilogic@0
|
217 svSystemSpecificInitialisation();
|
lbajardsilogic@0
|
218
|
lbajardsilogic@0
|
219 bool audioOutput = true;
|
lbajardsilogic@0
|
220 bool oscSupport = true;
|
lbajardsilogic@0
|
221
|
lbajardsilogic@0
|
222 if (args.contains("--help") || args.contains("-h") || args.contains("-?")) {
|
lbajardsilogic@0
|
223 std::cerr << QApplication::tr(
|
lbajardsilogic@41
|
224 "\nSound Access is a program for viewing and exploring multimedia archives for semantic multimedia analysis and retrieval.\n").arg(argv[0]).toStdString() << std::endl;
|
lbajardsilogic@0
|
225 exit(2);
|
lbajardsilogic@0
|
226 }
|
lbajardsilogic@0
|
227
|
lbajardsilogic@0
|
228 if (args.contains("--no-audio")) audioOutput = false;
|
lbajardsilogic@0
|
229 if (args.contains("--no-osc")) oscSupport = false;
|
lbajardsilogic@0
|
230
|
lbajardsilogic@41
|
231 QApplication::setOrganizationName("sound-access");
|
lbajardsilogic@41
|
232 QApplication::setOrganizationDomain("easaier.org");
|
lbajardsilogic@41
|
233 QApplication::setApplicationName("sound-access");
|
lbajardsilogic@0
|
234 QApplication::setWindowIcon(QIcon(":icons/svicon16.png"));
|
benoitrigolleau@58
|
235 //QApplication::setStyle(new QPlastiqueStyle);
|
benoitrigolleau@58
|
236 QApplication::setStyle(new EasaierStyle);
|
lbajardsilogic@2
|
237
|
lbajardsilogic@0
|
238 QString language = QLocale::system().name();
|
lbajardsilogic@0
|
239
|
lbajardsilogic@0
|
240 QTranslator qtTranslator;
|
lbajardsilogic@0
|
241 QString qtTrName = QString("qt_%1").arg(language);
|
lbajardsilogic@0
|
242 std::cerr << "Loading " << qtTrName.toStdString() << "..." << std::endl;
|
lbajardsilogic@0
|
243 qtTranslator.load(qtTrName);
|
lbajardsilogic@0
|
244 application.installTranslator(&qtTranslator);
|
lbajardsilogic@0
|
245
|
lbajardsilogic@0
|
246 QTranslator svTranslator;
|
lbajardsilogic@41
|
247 QString svTrName = QString("sound-access_%1").arg(language);
|
lbajardsilogic@0
|
248 std::cerr << "Loading " << svTrName.toStdString() << "..." << std::endl;
|
lbajardsilogic@55
|
249 if (svTranslator.load(svTrName, ":/i18n"))
|
lbajardsilogic@55
|
250 application.installTranslator(&svTranslator);
|
lbajardsilogic@0
|
251
|
lbajardsilogic@0
|
252 // Permit size_t and PropertyName to be used as args in queued signal calls
|
lbajardsilogic@0
|
253 qRegisterMetaType<size_t>("size_t");
|
lbajardsilogic@0
|
254 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
|
lbajardsilogic@0
|
255
|
lbajardsilogic@0
|
256 MainWindow gui(audioOutput, oscSupport);
|
lbajardsilogic@0
|
257 application.setMainWindow(&gui);
|
lbajardsilogic@0
|
258
|
lbajardsilogic@0
|
259 QDesktopWidget *desktop = QApplication::desktop();
|
lbajardsilogic@0
|
260 QRect available = desktop->availableGeometry();
|
lbajardsilogic@0
|
261
|
lbajardsilogic@0
|
262 int width = available.width() * 2 / 3;
|
lbajardsilogic@0
|
263 int height = available.height() / 2;
|
lbajardsilogic@0
|
264 if (height < 450) height = available.height() * 2 / 3;
|
lbajardsilogic@0
|
265 if (width > height * 2) width = height * 2;
|
lbajardsilogic@0
|
266
|
lbajardsilogic@0
|
267 QSettings settings;
|
lbajardsilogic@0
|
268 settings.beginGroup("MainWindow");
|
lbajardsilogic@0
|
269 QSize size = settings.value("size", QSize(width, height)).toSize();
|
lbajardsilogic@0
|
270 gui.resize(size);
|
lbajardsilogic@0
|
271 if (settings.contains("position")) {
|
lbajardsilogic@0
|
272 gui.move(settings.value("position").toPoint());
|
lbajardsilogic@0
|
273 }
|
lbajardsilogic@0
|
274 settings.endGroup();
|
lbajardsilogic@0
|
275
|
benoitrigolleau@58
|
276 //delay(5000);
|
benoitrigolleau@58
|
277
|
lbajardsilogic@0
|
278 gui.show();
|
benoitrigolleau@58
|
279 splash->finish(&gui);
|
benoitrigolleau@58
|
280 delete splash;
|
lbajardsilogic@0
|
281
|
lbajardsilogic@0
|
282 // The MainWindow class seems to have trouble dealing with this if
|
lbajardsilogic@0
|
283 // it tries to adapt to this preference before the constructor is
|
lbajardsilogic@0
|
284 // complete. As a lazy hack, apply it explicitly from here
|
lbajardsilogic@0
|
285 gui.preferenceChanged("Property Box Layout");
|
lbajardsilogic@0
|
286
|
lbajardsilogic@0
|
287 bool haveSession = false;
|
lbajardsilogic@0
|
288 bool haveMainModel = false;
|
lbajardsilogic@0
|
289
|
lbajardsilogic@0
|
290 for (QStringList::iterator i = args.begin(); i != args.end(); ++i) {
|
lbajardsilogic@0
|
291
|
lbajardsilogic@0
|
292 MainWindow::FileOpenStatus status = MainWindow::FileOpenFailed;
|
lbajardsilogic@0
|
293
|
lbajardsilogic@0
|
294 if (i == args.begin()) continue;
|
lbajardsilogic@0
|
295 if (i->startsWith('-')) continue;
|
lbajardsilogic@0
|
296
|
lbajardsilogic@0
|
297 if (i->startsWith("http:") || i->startsWith("ftp:")) {
|
lbajardsilogic@0
|
298 status = gui.openURL(QUrl(*i));
|
lbajardsilogic@0
|
299 continue;
|
lbajardsilogic@0
|
300 }
|
lbajardsilogic@0
|
301
|
lbajardsilogic@0
|
302 QString path = *i;
|
lbajardsilogic@0
|
303
|
lbajardsilogic@0
|
304 if (path.endsWith("sv")) {
|
lbajardsilogic@0
|
305 if (!haveSession) {
|
lbajardsilogic@0
|
306 status = gui.openSessionFile(path);
|
lbajardsilogic@0
|
307 if (status == MainWindow::FileOpenSucceeded) {
|
lbajardsilogic@0
|
308 haveSession = true;
|
lbajardsilogic@0
|
309 haveMainModel = true;
|
lbajardsilogic@0
|
310 }
|
lbajardsilogic@0
|
311 } else {
|
lbajardsilogic@0
|
312 std::cerr << "WARNING: Ignoring additional session file argument \"" << path.toStdString() << "\"" << std::endl;
|
lbajardsilogic@0
|
313 status = MainWindow::FileOpenSucceeded;
|
lbajardsilogic@0
|
314 }
|
lbajardsilogic@0
|
315 }
|
lbajardsilogic@0
|
316 if (status != MainWindow::FileOpenSucceeded) {
|
lbajardsilogic@0
|
317 if (!haveMainModel) {
|
lbajardsilogic@0
|
318 status = gui.openSomeFile(path, MainWindow::ReplaceMainModel);
|
lbajardsilogic@0
|
319 if (status == MainWindow::FileOpenSucceeded) haveMainModel = true;
|
lbajardsilogic@0
|
320 } else {
|
lbajardsilogic@0
|
321 status = gui.openSomeFile(path, MainWindow::CreateAdditionalModel);
|
lbajardsilogic@0
|
322 }
|
lbajardsilogic@0
|
323 }
|
lbajardsilogic@0
|
324 if (status == MainWindow::FileOpenFailed) {
|
lbajardsilogic@0
|
325 QMessageBox::critical
|
lbajardsilogic@0
|
326 (&gui, QMessageBox::tr("Failed to open file"),
|
lbajardsilogic@0
|
327 QMessageBox::tr("File \"%1\" could not be opened").arg(path));
|
lbajardsilogic@0
|
328 }
|
lbajardsilogic@0
|
329 }
|
lbajardsilogic@0
|
330 /*
|
lbajardsilogic@0
|
331 TipDialog tipDialog;
|
lbajardsilogic@0
|
332 if (tipDialog.isOK()) {
|
lbajardsilogic@0
|
333 tipDialog.exec();
|
lbajardsilogic@0
|
334 }
|
lbajardsilogic@0
|
335 */
|
lbajardsilogic@0
|
336 int rv = application.exec();
|
lbajardsilogic@0
|
337 // std::cerr << "application.exec() returned " << rv << std::endl;
|
lbajardsilogic@0
|
338
|
lbajardsilogic@0
|
339 cleanupMutex.lock();
|
lbajardsilogic@0
|
340 TempDirectory::getInstance()->cleanup();
|
lbajardsilogic@0
|
341 application.releaseMainWindow();
|
lbajardsilogic@0
|
342
|
lbajardsilogic@0
|
343 return rv;
|
lbajardsilogic@0
|
344 }
|