LibreMediaServer/lms-video
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Add file credits.txt

Browse source 
- Destructor and close audio process correctly

	new file:   libremediaserver/doc/credits.txt
	modified:   libremediaserver/doc/todo.txt
	modified:   libremediaserver/libremediaserver.cpp
	modified:   libremediaserver/libremediaserver.h
	modified:   libremediaserver/libremediaserver.ui
This commit is contained in:
Santi Noreña 2013-01-09 15:58:47 +01:00
parent a85d5503b9
commit e693c0eff8
5 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
libremediaserver/libremediaserver.cpp
View file

@ -1,6 +1,6 @@
/*
Pure Media Server - A Media Server Sotfware for stage and performing
v0.01-2
Copyright (C) 2012-2013 Santi Noreña libremediaserver@gmail.com
This program is free software: you can redistribute it and/or modify
@ -30,13 +30,9 @@
#include <QFileInfo>
#include <QFileDialog>
#include <QLocalServer>
//#include <sys/socket.h>
//#include <sys/types.h>
//#include <sys/un.h>
// Esto habrá que cambiarlo para poder utilizar varias instancias
#define PDPORTW 9195
//#define PDPORTR 9196 ya no hace falta
#define PDPORTW_AUDIO 9197
#define PDPORTR_AUDIO 9198
@ -171,13 +167,27 @@ libreMediaServer::~libreMediaServer()
if (m_pd_video != NULL)
{
disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
m_pd_video->close();
m_pd_video->terminate();
delete m_pd_video;
}
m_ola->close();
delete m_ola;
m_ola->close();
delete m_ola;
if (m_pd_audio != NULL)
{
m_pd_audio->terminate();
}
if (m_pd_write_audio != NULL)
{
m_pd_write_audio->close();
delete m_pd_write_audio;
}
if (m_pd_write_audio != NULL)
{
m_pd_read_audio->close();
}
}
///////////////////////////////////////////////////////////////////
// File Configuration Stuff
///////////////////////////////////////////////////////////////////
@ -186,7 +196,7 @@ libreMediaServer::~libreMediaServer()
void libreMediaServer::open()
{
QFile file("pms.conf");
QFile file("lms.conf");
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
qDebug()<<("Can not find the conf file");
@ -328,7 +338,7 @@ void libreMediaServer::save()
int offset = sizeof (struct conf) - 4;
memcpy(buffer+offset, m_pathmedia.toAscii().constData(), m_pathmedia.size());
QFile file("pms.conf");
QFile file("lms.conf");
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
{
qDebug()<<("Can not open file pms.conf");
@ -1334,6 +1344,20 @@ void libreMediaServer::on_audio_stateChanged(int state)
disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(pdrestart_audio()));
m_pd_audio->terminate();
m_pd_audio = NULL;
if (m_pd_write_audio != NULL)
{
disconnect(m_pd_write_audio, SIGNAL(connected()),this, SLOT(newconexion_audio()));
m_pd_write_audio->close();
delete m_pd_write_audio;
m_pd_write_audio == NULL;
}
if (m_pd_write_audio != NULL)
{
disconnect(m_pd_read_audio, SIGNAL(newConnection()),this, SLOT(newPeer_audio()));
m_pd_read_audio->close();
delete m_pd_read_audio;
m_pd_write_audio == NULL;
}
}
if ((state == 2))
{