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

Video Highlander #618

Merged
merged 19 commits into from Dec 3, 2014

Conversation

Projects
None yet
4 participants
@SteveGilvarry
Member

SteveGilvarry commented Dec 2, 2014

Yes that is right there can only be one. Rather than chop off heads, I have merged the two competing solutions for video storage. This is the raw merge so it will have issues, but I wanted to put this out there and see what people think.
Issues to be resolved

  • Detect when camera is being recorded as h264 and don't use videoevent code
  • Merge two competing UI options into one that works and can be merged to master.
  • Fix the FIXME's in videostorage

This will break feature-h264-videostorage branch, but you have to break some eggs to make a cake.

@knight-of-ni

This comment has been minimized.

Show comment
Hide comment
@knight-of-ni

knight-of-ni Dec 24, 2013

Member

Note that a div id of "videoEvent" is already being used in line 133. Probably should give this a different name.

Member

knight-of-ni commented on web/skins/classic/views/event.php in 2b79ff2 Dec 24, 2013

Note that a div id of "videoEvent" is already being used in line 133. Probably should give this a different name.

knight-of-ni pushed a commit that referenced this pull request Dec 3, 2014

Andrew Bauer
Merge pull request #618 from SteveGilvarry/Video-Highlander-Branch
Video Highlander - going to take your word on this one.

@knight-of-ni knight-of-ni merged commit 63f3ec4 into ZoneMinder:feature-h264-videostorage Dec 3, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@SteveGilvarry

This comment has been minimized.

Show comment
Hide comment
@SteveGilvarry

SteveGilvarry Jan 13, 2015

Member

@connortechnology I don't think $Monitor is available here, well it doesn't seem to be defined when I debug it. But I am merging two branches so I may have clobbered something that loaded it. I know it was a while ago, but maybe you have branch still working and can check it.

Member

SteveGilvarry commented on web/skins/classic/views/event.php in 617179b Jan 13, 2015

@connortechnology I don't think $Monitor is available here, well it doesn't seem to be defined when I debug it. But I am merging two branches so I may have clobbered something that loaded it. I know it was a while ago, but maybe you have branch still working and can check it.

This comment has been minimized.

Show comment
Hide comment
@connortechnology

connortechnology Jan 13, 2015

Member

I might have pushed this, but it was originally written by @mastertheknife . Seems to me that Monitor needs to be defined. Perhaps the line that defines it has been lost.

Member

connortechnology replied Jan 13, 2015

I might have pushed this, but it was originally written by @mastertheknife . Seems to me that Monitor needs to be defined. Perhaps the line that defines it has been lost.

@SteveGilvarry

This comment has been minimized.

Show comment
Hide comment
@SteveGilvarry

SteveGilvarry Jan 13, 2015

Member

No worries I pulled the required field in with the event query, which was already joining monitor table so easy to just add those new fields.

Member

SteveGilvarry commented on 617179b Jan 13, 2015

No worries I pulled the required field in with the event query, which was already joining monitor table so easy to just add those new fields.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment