Permalink
Browse files

Fixed various issues to be able to use the compiled library

  • Loading branch information...
1 parent 8684471 commit 33dec9d238187c36590e63e0ab17db81695589fc @marefr marefr committed Oct 21, 2012
@@ -73,6 +73,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -81,6 +82,9 @@
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)..\..\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libdvblinkremote.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>
+ </IgnoreAllDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
</Link>
<ProjectReference>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
@@ -71,7 +71,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -97,8 +97,10 @@ if not exist "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\" mkdi
COPY /Y "$(SolutionDir)..\..\src\curlhttpclient.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\curlhttpclient.h"
COPY /Y "$(SolutionDir)..\..\src\dvblinkremote.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\dvblinkremote.h"
COPY /Y "$(SolutionDir)..\..\src\dvblinkremotehttp.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\dvblinkremotehttp.h"
+COPY /Y "$(SolutionDir)..\..\src\dvblinkremoteserialization.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\dvblinkremoteserialization.h"
COPY /Y "$(SolutionDir)..\..\src\request.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\request.h"
COPY /Y "$(SolutionDir)..\..\src\response.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\response.h"
+COPY /Y "$(SolutionDir)..\..\src\scheduling.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\scheduling.h"
COPY /Y "$(SolutionDir)..\..\src\version.h" "$(SolutionDir)..\..\..\dvblinkremote\include\$(TargetName)\version.h"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -168,6 +168,11 @@ ItemMetadata::ItemMetadata(ItemMetadata& itemMetadata)
IsCatAdult = itemMetadata.IsCatAdult;
}
+ItemMetadata::~ItemMetadata()
+{
+
+}
+
std::string& ItemMetadata::GetTitle()
{
return m_title;
@@ -58,9 +58,6 @@ PlaybackContainer::DVBLinkPlaybackContainerContentType& PlaybackContainer::GetCo
return m_containerContentType;
}
-PlaybackContainerList::PlaybackContainerList()
-{ }
-
PlaybackContainerList::~PlaybackContainerList()
{
for (std::vector<PlaybackContainer*>::iterator it = begin(); it < end(); it++)
@@ -139,10 +139,6 @@ VideoItem::~VideoItem()
}
-PlaybackItemList::PlaybackItemList()
-{
-
-}
PlaybackItemList::~PlaybackItemList()
{
for (std::vector<PlaybackItem*>::iterator it = begin(); it < end(); it++)
@@ -122,6 +122,16 @@ GetPlaybackObjectResponse::~GetPlaybackObjectResponse()
}
}
+PlaybackContainerList& GetPlaybackObjectResponse::GetPlaybackContainers()
+{
+ return *m_playbackContainerList;
+}
+
+PlaybackItemList& GetPlaybackObjectResponse::GetPlaybackItems()
+{
+ return *m_playbackItemList;
+}
+
bool GetPlaybackObjectResponseSerializer::ReadObject(GetPlaybackObjectResponse& object, const std::string& xml)
{
tinyxml2::XMLDocument& doc = GetXmlDocument();
@@ -843,11 +843,6 @@ namespace dvblinkremote {
{
public:
/**
- * Initializes a new instance of the dvblinkremote::PlaybackContainerList class.
- */
- PlaybackContainerList();
-
- /**
* Destructor for cleaning up allocated memory.
*/
~PlaybackContainerList();
@@ -1103,11 +1098,6 @@ namespace dvblinkremote {
{
public:
/**
- * Initializes a new instance of the dvblinkremote::PlaybackItemList class.
- */
- PlaybackItemList();
-
- /**
* Destructor for cleaning up allocated memory.
*/
~PlaybackItemList();
@@ -22,8 +22,6 @@
***************************************************************************/
#include "scheduling.h"
-#include "request.h"
-#include "response.h"
#include "xml_object_serializer.h"
using namespace dvblinkremote;
@@ -241,6 +239,40 @@ bool GetSchedulesRequestSerializer::WriteObject(std::string& serializedData, Get
return true;
}
+StoredManualSchedule::StoredManualSchedule(const std::string& id, const std::string& channelId, const long startTime, const long duration, const long dayMask, const std::string& title)
+ : ManualSchedule(id, channelId, startTime, duration, dayMask, title)
+{
+
+}
+
+StoredManualSchedule::~StoredManualSchedule()
+{ }
+
+StoredManualScheduleList::~StoredManualScheduleList()
+{
+ for (std::vector<StoredManualSchedule*>::const_iterator it = begin(); it < end(); it++)
+ {
+ delete (*it);
+ }
+}
+
+StoredEpgSchedule::StoredEpgSchedule(const std::string& id, const std::string& channelId, const std::string& programId, const bool repeat, const bool newOnly, const bool recordSeriesAnytime)
+ : EpgSchedule(id, channelId, programId, repeat, newOnly, recordSeriesAnytime)
+{
+
+}
+
+StoredEpgSchedule::~StoredEpgSchedule()
+{ }
+
+StoredEpgScheduleList::~StoredEpgScheduleList()
+{
+ for (std::vector<StoredEpgSchedule*>::const_iterator it = begin(); it < end(); it++)
+ {
+ delete (*it);
+ }
+}
+
StoredSchedules::StoredSchedules()
{
m_manualScheduleList = new StoredManualScheduleList();
@@ -268,22 +300,6 @@ StoredEpgScheduleList& StoredSchedules::GetEpgSchedules()
return *m_epgScheduleList;
}
-StoredManualScheduleList::~StoredManualScheduleList()
-{
- for (std::vector<StoredManualSchedule*>::const_iterator it = begin(); it < end(); it++)
- {
- delete (*it);
- }
-}
-
-StoredEpgScheduleList::~StoredEpgScheduleList()
-{
- for (std::vector<StoredEpgSchedule*>::const_iterator it = begin(); it < end(); it++)
- {
- delete (*it);
- }
-}
-
bool GetSchedulesResponseSerializer::ReadObject(StoredSchedules& object, const std::string& xml)
{
tinyxml2::XMLDocument& doc = GetXmlDocument();
@@ -24,7 +24,7 @@
#pragma once
#define LIBDVBLINKREMOTE_COPYRIGHT "2012 Marcus Efraimsson"
-#define LIBDVBLINKREMOTE_VERSION "0.1.0"
+#define LIBDVBLINKREMOTE_VERSION "0.2.0"
#define LIBDVBLINKREMOTE_VERSION_MAJOR 0
-#define LIBDVBLINKREMOTE_VERSION_MINOR 1
+#define LIBDVBLINKREMOTE_VERSION_MINOR 2
#define LIBDVBLINKREMOTE_VERSION_PATCH 0

0 comments on commit 33dec9d

Please sign in to comment.