Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request to update for supporting LCP #46

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from

Conversation

drminside
Copy link

Dear Readium SDK people.

I send a pull request for SDKLanucher-OSX for supporting LCP.

Following are summary for changed files:

  1. LauncherOSX.xcodeproj/project.pbxproj :
    We added 'drmInitialize.h' file for DRM initialization
  2. LauncherOSX/LOXAppDelegate.mm
    • OpenPrint:(id)sender
      We added a print function controlled by 'print' right in the License Document.
      It is linked to Menu 'print', which is in the LauncherOSX/en.lproj/MainMenu.xib
  3. LauncherOSX/LOXePubSdkApi.h
    We added checkActionPrint() prototype
  4. LauncherOSX/LOXePubSdkApi.mm
    • (void)initialize
      We added Drminitialize function call, which is currently disabled by definition FALSE.
      Because if it is in the compiled code, link error will be occurred due to no LCP library.
      So if user wants to include the DRM feature into the Launcher, he has to make READIUM_DRM definition as TRUE and include the Readium DRM submodule into the Launcher project,
      - (bool) checkActionPrint
      We added a right checking function for the print action
  5. LauncherOSX/drmInitialize.h
    It is added for drmInitialize() prototype whose .mm code is in Readium DRM submodule
  6. LauncherOSX/en.lproj/MainMenu.xib
    Menu UI XML has changed automatically for 2.OpenPrint App Delegate

This pull request does not include Readium DRM submodule, which is necessary to activate DrmInitialize() in change 4.

I think this is one of the best ways to maintain DRM feature separately against Launcher and not to shake existing project structure much.

If anyone has a better idea, please suggest us.

And as soon as finishing OSX integration, we will send other pull request for iOS and Android Launcher.

@danielweck
Copy link
Member

Thanks @drminside that's a very straight-forward code contribution, educational too! (at least for me, as I am not familiar with the ContentModule aspects of the ReadiumSDK C++ lib, only the ContentFilter parts)

@drminside
Copy link
Author

@danielweck
Thanks for your comment.
These codes does not include contentModule implementation, which we have moved all to the Readium DRM submodule.
BTW who is responsible to review this pull request and decide to accept?

@rkwright
Copy link
Member

Need to figure out how this dovetails with the ongoing work to integrate LCP into Readium

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants