Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2019-06-04 12:58:22 -04:00
parent 1bcadcda73 8f008d1d70
commit 120b9bf07c
13 changed files with 1988 additions and 1548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rd.h
View File

@@ -2,7 +2,7 @@
//
// System-Wide Values for Rivendell
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -365,7 +365,6 @@
#define CAE_MAX_ARGS 10
#define CAE_MAX_LENGTH 256
#define CAE_POLL_INTERVAL 50
#define CAE_MAX_CONNECTIONS 128
/*
* Default Sample Rate

1
lib/rdcae.cpp
View File

@@ -541,7 +541,6 @@ void RDCae::DispatchCommand(RDCmdCache *cmd)
for(int i=0;i<RD_MAX_CARDS;i++) {
for(int j=0;j<RD_MAX_STREAMS;j++) {
if(cae_handle[i][j]==handle) {
//emit playPositionChanged(handle,cae_output_positions[i][j]);
emit playPositionChanged(handle,pos);
}
}