Changeset 1079 for applications/bdmtoolbox/mex

Timestamp:

06/10/10 21:54:57 (14 years ago)

Author:

smidl

Message:

Changes in merger + change in loading ARX

Files:

• applications/bdmtoolbox/mex/merger.cpp (modified) (3 diffs)

applications/bdmtoolbox/mex/merger.cpp

@@ -59 +59 @@
         Array<shared_ptr<pdf> >  Sources;
         UI::get(Sources, Cfg, "Sources", UI::compulsory);
-        shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );
+        shared_ptr<MergerDiscrete> Merger = UI::build<MergerDiscrete> ( Cfg, "Merger" );
 
         // Support
@@ -82 +82 @@
         for ( int i = 0;i < Sources.length();i++ ) {
                 datalink_m2e dl;
-                dl.set_connection ( Sources ( i )->_rv(), Sources ( i )->_rvc(), Merger->_rv() );
+                dl.set_connection ( Sources ( i )->_rv(), Sources ( i )->_rvc(), Merger->merger()._rv() );
 
                 vec ll ( Merger->_Smp()._samples().length() );
@@ -102 +102 @@
                 vec ll ( Merger->_Smp()._samples().length() );
                 for ( int j = 0; j < Merger->_Smp()._samples().length(); j++ ) {
-                        ll ( j ) = Merger->evallog ( Merger->_Smp()._samples() ( j ) );
+                        ll ( j ) = MerMix->merger()._w ()(j);
                 }