Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-20 23:51:21 +01:00
Code Issues Projects Releases Wiki Activity

Master (#6)

Browse Source 
* Fixed bug where wrong ID was used for local maintenance

* Updated ChangeLog

* Added ability to run macros from cart list with "Run Macro" button

* Updated ChangeLog

* Updated translations

* 2018-10-18 Fred Gleason <fredg@paravelsystems.com>
	* Tweaked the position of buttons on the bottom row of the main
	screen of rdlibrary(1).
	* Changed the minimum size of the main screen of rdlibrary to
	850x600.

* 2018-10-18 Fred Gleason <fredg@paravelsystems.com>
	* Fixed a regression in rdmaint(8) that broke cut rehashing.

* 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
	* Added code in the %post and %preun rules in 'rivendell.spec.in'
	to enable and disable the 'rivendell' service.

* 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
	* Modified rdservice(8) to log errors to syslog.
	* Added an rdservice(8) man page.
	* Modified 'systemd/rivendell.service.in' to enable automatic
	start retries.

* 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
	* Fixed a typo that broke generation of the rmlsend(1) man page.

* 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
	* Removed 'build_win32.bat'.
	* Removed all conditional compilation based on 'WIN32'.

* 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
	* Removed check for Win32 installer from 'configure.ac'.
	* Removed win32 clauses from '.pro' files.
This commit is contained in:
Deltec Enterprises
2018-10-19 16:52:56 -07:00
committed by GitHub
parent 48bbe8ee67
commit 4a3106c8dc
82 changed files with 478 additions and 1524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/rdcut.cpp
View File

@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef WIN32
#include <unistd.h>
#endif // WIN32
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
@@ -31,9 +29,7 @@
#include <rd.h>
#include <rdconf.h>
#ifndef WIN32
#include <rdwavefile.h>
#endif
#include <rdcut.h>
#include <rdtextvalidator.h>
@@ -863,9 +859,6 @@ void RDCut::logPlayout() const
bool RDCut::copyTo(RDStation *station,RDUser *user,
const QString &cutname,RDConfig *config) const
{
#ifdef WIN32
return false;
#else
QString sql;
RDSqlQuery *q;
RDSqlQuery *q1;
@@ -953,7 +946,6 @@ bool RDCut::copyTo(RDStation *station,RDUser *user,
delete conv;
return ret;
#endif
}
@@ -1182,9 +1174,6 @@ bool RDCut::checkInRecording(const QString &station_name,
RDSettings *settings,
unsigned msecs) const
{
#ifdef WIN32
return false;
#else
QString sql;
RDSqlQuery *q;
int format;
@@ -1260,13 +1249,11 @@ bool RDCut::checkInRecording(const QString &station_name,
q=new RDSqlQuery(sql);
delete q;
return true;
#endif // WIN32
}
void RDCut::autoTrim(RDCut::AudioEnd end,int level)
{
#ifndef WIN32
int point;
int start_point=0;
int end_point=-1;
@@ -1318,14 +1305,12 @@ void RDCut::autoTrim(RDCut::AudioEnd end,int level)
}
setLength(end_point-start_point);
delete wave;
#endif // WIN32
}
void RDCut::autoSegue(int level,int length,RDStation *station,RDUser *user,
RDConfig *config)
{
#ifndef WIN32
int point;
// int start_point;
@@ -1369,13 +1354,11 @@ void RDCut::autoSegue(int level,int length,RDStation *station,RDUser *user,
}
}
delete wave;
#endif // WIN32
}
void RDCut::reset() const
{
#ifndef WIN32
QString sql;
RDSqlQuery *q;
int format;
@@ -1446,7 +1429,6 @@ void RDCut::reset() const
delete q;
wave->closeWave();
delete wave;
#endif // WIN32
}
@@ -1719,7 +1701,6 @@ void RDCut::GetDefaultDateTimes(QString *start_dt,QString *end_dt,
bool RDCut::FileCopy(const QString &srcfile,const QString &destfile) const
{
#ifndef WIN32
int src_fd;
int dest_fd;
struct stat src_stat;
@@ -1763,7 +1744,7 @@ bool RDCut::FileCopy(const QString &srcfile,const QString &destfile) const
free(buf);
close(src_fd);
close(dest_fd);
#endif
return true;
}