Commit 7fedceff authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 0.99+dfsg

parent be6af9e1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -84,4 +84,4 @@ SigViewer Online Repository is [here](repository/Updates.xml).

## <a name="support"></a>Support

[Email author](mailto:yida.lin@outlook.com) or report a new [issue](https://github.com/Yida-Lin/libxdf/issues).
[Email author](mailto:yl3842@columbia.edu) or report a new [issue](https://github.com/Yida-Lin/libxdf/issues).
+13 −12
Original line number Diff line number Diff line
@@ -612,10 +612,7 @@ void Xdf::syncTimeStamps()
                }
            }

            if (this->streams[elem.second].clock_times[k] < elem.first.second)
            {
                elem.first.second += this->streams[elem.second].clock_values[k];
            }
            elem.first.second += this->streams[elem.second].clock_values[k]; // apply the last offset value to the timestamp; if there hasn't yet been an offset value take the first recorded one
        }
    }

@@ -832,6 +829,7 @@ void Xdf::findMajSR()
        }
    }

    if(srateMap.size() > 0){
        //search the srateMap to see which sample rate has the most channels
        int index (std::distance(srateMap.begin(),
                                 std::max_element(srateMap.begin(),srateMap.end(),
@@ -840,6 +838,9 @@ void Xdf::findMajSR()
                                                { return largest.second < first.second; })));

        majSR = srateMap[index].first; //the sample rate that has the most channels
    } else {
        majSR = 0; //if there are no streams with a fixed sample reate
    }
}

void Xdf::calcTotalChannel()